- wine-devel - winehq.org

[PATCH 5/5] bcrypt/tests: Add simple test for RSA.
by Hans Leidekker 26 Mar '18

26 Mar '18

From: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Based on patch from Bernhard Übelacker. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 57d04882b5..7d59f6d4c1 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1495,6 +1495,100 @@ static void test_ECDSA(void) pBCryptCloseAlgorithmProvider(alg, 0); } +static UCHAR rsaPublicBlob[] = +{ + 0x52, 0x53, 0x41, 0x31, 0x00, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0xad, 0x41, 0x09, 0xa2, 0x56, + 0x3a, 0x7b, 0x75, 0x4b, 0x72, 0x9b, 0x28, 0x72, 0x3b, 0xae, 0x9f, 0xd8, 0xa8, 0x25, 0x4a, 0x4c, + 0x19, 0xf5, 0xa6, 0xd0, 0x05, 0x1c, 0x59, 0x8f, 0xe3, 0xf3, 0x2d, 0x29, 0x47, 0xf8, 0x80, 0x25, + 0x25, 0x21, 0x58, 0xc2, 0xac, 0xa1, 0x9e, 0x93, 0x8e, 0x82, 0x6d, 0xd7, 0xf3, 0xe7, 0x8f, 0x0b, + 0xc0, 0x41, 0x85, 0x29, 0x3c, 0xf1, 0x0b, 0x2c, 0x5d, 0x49, 0xed, 0xb4, 0x30, 0x6e, 0x02, 0x15, + 0x4b, 0x9a, 0x08, 0x0d, 0xe1, 0x6f, 0xa8, 0xd3, 0x12, 0xab, 0x66, 0x48, 0x4d, 0xd9, 0x28, 0x03, + 0x6c, 0x9d, 0x44, 0x7a, 0xed, 0xc9, 0x43, 0x4f, 0x9d, 0x4e, 0x3c, 0x7d, 0x0e, 0xff, 0x07, 0x87, + 0xeb, 0xca, 0xca, 0x65, 0x6d, 0xbe, 0xc5, 0x31, 0x8b, 0xcc, 0x7e, 0x0a, 0x71, 0x4a, 0x4d, 0x9d, + 0x3d, 0xfd, 0x7a, 0x56, 0x32, 0x8a, 0x6c, 0x6d, 0x9d, 0x2a, 0xd9, 0x8e, 0x68, 0x89, 0x63, 0xc6, + 0x4f, 0x24, 0xd1, 0x2a, 0x72, 0x69, 0x08, 0x77, 0xa0, 0x7f, 0xfe, 0xc6, 0x33, 0x8d, 0xb4, 0x7d, + 0x73, 0x91, 0x13, 0x9c, 0x47, 0x53, 0x6a, 0x13, 0xdf, 0x19, 0xc7, 0xed, 0x48, 0x81, 0xed, 0xd8, + 0x1f, 0x11, 0x11, 0xbb, 0x41, 0x15, 0x5b, 0xa4, 0xf5, 0xc9, 0x2b, 0x48, 0x5e, 0xd8, 0x4b, 0x52, + 0x1f, 0xf7, 0x87, 0xf2, 0x68, 0x25, 0x28, 0x79, 0xee, 0x39, 0x41, 0xc9, 0x0e, 0xc8, 0xf9, 0xf2, + 0xd8, 0x24, 0x09, 0xb4, 0xd4, 0xb7, 0x90, 0xba, 0x26, 0xe8, 0x1d, 0xb4, 0xd7, 0x09, 0x00, 0xc4, + 0xa0, 0xb6, 0x14, 0xe8, 0x4c, 0x29, 0x60, 0x54, 0x2e, 0x01, 0xde, 0x54, 0x66, 0x40, 0x22, 0x50, + 0x27, 0xf1, 0xe7, 0x62, 0xa9, 0x00, 0x5a, 0x61, 0x2e, 0xfa, 0xfe, 0x16, 0xd8, 0xe0, 0xe7, 0x66, + 0x17, 0xda, 0xb8, 0x0c, 0xa6, 0x04, 0x8d, 0xf8, 0x21, 0x68, 0x39 +}; + +static UCHAR rsaHash[] = +{ + 0x96, 0x1f, 0xa6, 0x49, 0x58, 0x81, 0x8f, 0x76, 0x77, 0x07, 0x07, 0x27, 0x55, 0xd7, 0x01, 0x8d, + 0xcd, 0x27, 0x8e, 0x94 +}; + +static UCHAR rsaSignature[] = +{ + 0xa8, 0x3a, 0x9d, 0xaf, 0x92, 0x94, 0xa4, 0x4d, 0x34, 0xba, 0x41, 0x0c, 0xc1, 0x23, 0x91, 0xc7, + 0x91, 0xa8, 0xf8, 0xfc, 0x94, 0x87, 0x4d, 0x05, 0x85, 0x63, 0xe8, 0x7d, 0xea, 0x7f, 0x6b, 0x8d, + 0xbb, 0x9a, 0xd4, 0x46, 0xa6, 0xc0, 0xd6, 0xdc, 0x91, 0xba, 0xd3, 0x1a, 0xbf, 0xf4, 0x52, 0xa0, + 0xc7, 0x15, 0x87, 0xe9, 0x1e, 0x60, 0x49, 0x9c, 0xee, 0x5a, 0x9c, 0x6c, 0xbd, 0x7a, 0x3e, 0xc3, + 0x48, 0xb3, 0xee, 0xca, 0x68, 0x40, 0x9b, 0xa1, 0x4c, 0x6e, 0x20, 0xd6, 0xca, 0x6c, 0x72, 0xaf, + 0x2b, 0x6b, 0x62, 0x7c, 0x78, 0x06, 0x94, 0x4c, 0x02, 0xf3, 0x8d, 0x49, 0xe0, 0x11, 0xc4, 0x9b, + 0x62, 0x5b, 0xc2, 0xfd, 0x68, 0xf4, 0x07, 0x15, 0x71, 0x11, 0x4c, 0x35, 0x97, 0x5d, 0xc0, 0xe6, + 0x22, 0xc9, 0x8a, 0x7b, 0x96, 0xc9, 0xc3, 0xe4, 0x2b, 0x1e, 0x88, 0x17, 0x4f, 0x98, 0x9b, 0xf3, + 0x42, 0x23, 0x0c, 0xa0, 0xfa, 0x19, 0x03, 0x2a, 0xf7, 0x13, 0x2d, 0x27, 0xac, 0x9f, 0xaf, 0x2d, + 0xa3, 0xce, 0xf7, 0x63, 0xbb, 0x39, 0x9f, 0x72, 0x80, 0xdd, 0x6c, 0x73, 0x00, 0x85, 0x70, 0xf2, + 0xed, 0x50, 0xed, 0xa0, 0x74, 0x42, 0xd7, 0x22, 0x46, 0x24, 0xee, 0x67, 0xdf, 0xb5, 0x45, 0xe8, + 0x49, 0xf4, 0x9c, 0xe4, 0x00, 0x83, 0xf2, 0x27, 0x8e, 0xa2, 0xb1, 0xc3, 0xc2, 0x01, 0xd7, 0x59, + 0x2e, 0x4d, 0xac, 0x49, 0xa2, 0xc1, 0x8d, 0x88, 0x4b, 0xfe, 0x28, 0xe5, 0xac, 0xa6, 0x85, 0xc4, + 0x1f, 0xf8, 0xc5, 0xc5, 0x14, 0x4e, 0xa3, 0xcb, 0x17, 0xb7, 0x64, 0xb3, 0xc2, 0x12, 0xf8, 0xf8, + 0x36, 0x99, 0x1c, 0x91, 0x9b, 0xbd, 0xed, 0x55, 0x0f, 0xfd, 0x49, 0x85, 0xbb, 0x32, 0xad, 0x78, + 0xc1, 0x74, 0xe6, 0x7c, 0x18, 0x0f, 0x2b, 0x3b, 0xaa, 0xd1, 0x9d, 0x40, 0x71, 0x1d, 0x19, 0x53 +}; + +static void test_RSA(void) +{ + BCRYPT_PKCS1_PADDING_INFO pad; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_KEY_HANDLE key = NULL; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (ret) + { + win_skip("Failed to open RSA provider: %08x, skipping test\n", ret); + return; + } + + ret = pBCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(!ret, "pBCryptImportKeyPair failed: %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(!ret, "pBCryptVerifySignature failed: %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_AES_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_NOT_SUPPORTED, "Expected STATUS_NOT_SUPPORTED, got %08x\n", ret); + + pad.pszAlgId = NULL; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(!ret, "pBCryptDestroyKey failed: %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "pBCryptCloseAlgorithmProvider failed: %08x\n", ret); +} + START_TEST(bcrypt) { HMODULE module; @@ -1538,6 +1632,7 @@ START_TEST(bcrypt) test_BCryptDecrypt(); test_key_import_export(); test_ECDSA(); + test_RSA(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); -- 2.11.0

1 0

[PATCH 4/5] bcrypt: Initial implementation for RSA key import and signature verification.
by Hans Leidekker 26 Mar '18

26 Mar '18

From: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 127 +++++++++++++++++++++++++++++++++++++++++----- include/bcrypt.h | 17 +++++++ 2 files changed, 130 insertions(+), 14 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index d41195e00d..1490089cf7 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -76,6 +76,9 @@ static gnutls_sign_algorithm_t (*pgnutls_pk_to_sign)(gnutls_pk_algorithm_t, gnut static int (*pgnutls_pubkey_verify_hash2)(gnutls_pubkey_t, gnutls_sign_algorithm_t, unsigned int, const gnutls_datum_t *, const gnutls_datum_t *); +/* Not present in gnutls version < 2.11.0 */ +static int (*pgnutls_pubkey_import_rsa_raw)(gnutls_pubkey_t key, const gnutls_datum_t *m, const gnutls_datum_t *e); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_cipher_decrypt2); @@ -119,6 +122,11 @@ static int compat_gnutls_pubkey_verify_hash2(gnutls_pubkey_t key, gnutls_sign_al return GNUTLS_E_UNKNOWN_CIPHER_TYPE; } +static int compat_gnutls_pubkey_import_rsa_raw(gnutls_pubkey_t key, const gnutls_datum_t *m, const gnutls_datum_t *e) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -185,6 +193,11 @@ static BOOL gnutls_initialize(void) WARN("gnutls_pubkey_verify_hash2 not found\n"); pgnutls_pubkey_verify_hash2 = compat_gnutls_pubkey_verify_hash2; } + if (!(pgnutls_pubkey_import_rsa_raw = wine_dlsym( libgnutls_handle, "gnutls_pubkey_import_rsa_raw", NULL, 0 ))) + { + WARN("gnutls_pubkey_import_rsa_raw not found\n"); + pgnutls_pubkey_import_rsa_raw = compat_gnutls_pubkey_import_rsa_raw; + } if (TRACE_ON( bcrypt )) { @@ -270,6 +283,7 @@ enum alg_id ALG_ID_MD4, ALG_ID_MD5, ALG_ID_RNG, + ALG_ID_RSA, ALG_ID_SHA1, ALG_ID_SHA256, ALG_ID_SHA384, @@ -303,6 +317,7 @@ alg_props[] = /* ALG_ID_MD4 */ { 270, 16, 512, BCRYPT_MD4_ALGORITHM, FALSE }, /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM, FALSE }, /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM, FALSE }, + /* ALG_ID_RSA */ { 0, 0, 0, BCRYPT_RSA_ALGORITHM, FALSE }, /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM, FALSE }, /* ALG_ID_SHA256 */ { 286, 32, 512, BCRYPT_SHA256_ALGORITHM, FALSE }, /* ALG_ID_SHA384 */ { 382, 48, 1024, BCRYPT_SHA384_ALGORITHM, FALSE }, @@ -380,6 +395,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR else if (!strcmpW( id, BCRYPT_MD4_ALGORITHM )) alg_id = ALG_ID_MD4; else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; else if (!strcmpW( id, BCRYPT_RNG_ALGORITHM )) alg_id = ALG_ID_RNG; + else if (!strcmpW( id, BCRYPT_RSA_ALGORITHM )) alg_id = ALG_ID_RSA; else if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256; else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; @@ -1242,6 +1258,7 @@ static NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, con { case ALG_ID_ECDSA_P256: case ALG_ID_ECDSA_P384: + case ALG_ID_RSA: break; default: @@ -1401,6 +1418,34 @@ static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnut return STATUS_SUCCESS; } +static NTSTATUS import_gnutls_pubkey_rsa( struct key *key, gnutls_pubkey_t *gnutls_key ) +{ + BCRYPT_RSAKEY_BLOB *rsa_blob; + gnutls_datum_t m, e; + int ret; + + if ((ret = pgnutls_pubkey_init( gnutls_key ))) + { + 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); + e.size = rsa_blob->cbPublicExp; + m.data = key->u.a.pubkey + sizeof(*rsa_blob) + rsa_blob->cbPublicExp; + m.size = rsa_blob->cbModulus; + + if ((ret = pgnutls_pubkey_import_rsa_raw( *gnutls_key, &m, &e ))) + { + pgnutls_perror( ret ); + pgnutls_pubkey_deinit( *gnutls_key ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_key ) { switch (key->alg_id) @@ -1409,6 +1454,9 @@ static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_k case ALG_ID_ECDSA_P384: return import_gnutls_pubkey_ecc( key, gnutls_key ); + case ALG_ID_RSA: + return import_gnutls_pubkey_rsa( key, gnutls_key ); + default: FIXME("algorithm %u not yet supported\n", key->alg_id ); return STATUS_NOT_IMPLEMENTED; @@ -1437,6 +1485,14 @@ static NTSTATUS prepare_gnutls_signature_ecc( struct key *key, UCHAR *signature, return STATUS_SUCCESS; } +static NTSTATUS prepare_gnutls_signature_rsa( struct key *key, UCHAR *signature, ULONG signature_len, + gnutls_datum_t *gnutls_signature ) +{ + gnutls_signature->data = signature; + gnutls_signature->size = signature_len; + return STATUS_SUCCESS; +} + static NTSTATUS prepare_gnutls_signature( struct key *key, UCHAR *signature, ULONG signature_len, gnutls_datum_t *gnutls_signature ) { @@ -1446,6 +1502,9 @@ static NTSTATUS prepare_gnutls_signature( struct key *key, UCHAR *signature, ULO case ALG_ID_ECDSA_P384: return prepare_gnutls_signature_ecc( key, signature, signature_len, gnutls_signature ); + case ALG_ID_RSA: + return prepare_gnutls_signature_rsa( key, signature, signature_len, gnutls_signature ); + default: FIXME( "algorithm %u not yet supported\n", key->alg_id ); return STATUS_NOT_IMPLEMENTED; @@ -1463,26 +1522,45 @@ static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *ha NTSTATUS status; int ret; - if (flags) FIXME( "flags %08x not supported\n", flags ); - - /* only the hash size must match, not the actual hash function */ - switch (hash_len) - { - case 32: hash_alg = GNUTLS_DIG_SHA256; break; - case 48: hash_alg = GNUTLS_DIG_SHA384; break; - - default: - FIXME( "hash size %u not yet supported\n", hash_len ); - return STATUS_INVALID_SIGNATURE; - } - switch (key->alg_id) { case ALG_ID_ECDSA_P256: case ALG_ID_ECDSA_P384: + { + if (flags) FIXME( "flags %08x not supported\n", flags ); + + /* only the hash size must match, not the actual hash function */ + switch (hash_len) + { + case 32: hash_alg = GNUTLS_DIG_SHA256; break; + case 48: hash_alg = GNUTLS_DIG_SHA384; break; + + default: + FIXME( "hash size %u not yet supported\n", hash_len ); + return STATUS_INVALID_SIGNATURE; + } pk_alg = GNUTLS_PK_ECC; break; + } + case ALG_ID_RSA: + { + BCRYPT_PKCS1_PADDING_INFO *info = (BCRYPT_PKCS1_PADDING_INFO *)padding; + if (!(flags & BCRYPT_PAD_PKCS1) || !info) return STATUS_INVALID_PARAMETER; + if (!info->pszAlgId) return STATUS_INVALID_SIGNATURE; + + if (!strcmpW( info->pszAlgId, BCRYPT_SHA1_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA1; + else if (!strcmpW( info->pszAlgId, BCRYPT_SHA256_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA256; + else if (!strcmpW( info->pszAlgId, BCRYPT_SHA384_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA384; + else if (!strcmpW( info->pszAlgId, BCRYPT_SHA512_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA512; + else + { + FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) ); + return STATUS_NOT_SUPPORTED; + } + pk_alg = GNUTLS_PK_RSA; + break; + } default: FIXME( "algorithm %u not yet supported\n", key->alg_id ); return STATUS_NOT_IMPLEMENTED; @@ -1505,7 +1583,7 @@ static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *ha gnutls_hash.size = hash_len; ret = pgnutls_pubkey_verify_hash2( gnutls_key, sign_alg, 0, &gnutls_hash, &gnutls_signature ); - heap_free( gnutls_signature.data ); + if (gnutls_signature.data != signature) heap_free( gnutls_signature.data ); pgnutls_pubkey_deinit( gnutls_key ); return (ret < 0) ? STATUS_INVALID_SIGNATURE : STATUS_SUCCESS; } @@ -1945,6 +2023,27 @@ NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HAN *ret_key = key; return STATUS_SUCCESS; } + else if (!strcmpW( type, BCRYPT_RSAPUBLIC_BLOB )) + { + BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; + ULONG size; + + if (input_len < sizeof(*rsa_blob)) return STATUS_INVALID_PARAMETER; + if (alg->id != ALG_ID_RSA || rsa_blob->Magic != BCRYPT_RSAPUBLIC_MAGIC) return STATUS_NOT_SUPPORTED; + + if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; + key->hdr.magic = MAGIC_KEY; + + size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; + if ((status = key_asymmetric_init( key, alg, (BYTE *)rsa_blob, size ))) + { + heap_free( key ); + return status; + } + + *ret_key = key; + return STATUS_SUCCESS; + } FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_SUPPORTED; diff --git a/include/bcrypt.h b/include/bcrypt.h index f28b0d395d..df54f621fa 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -63,6 +63,8 @@ typedef LONG NTSTATUS; #define BCRYPT_AES_WRAP_KEY_BLOB (const WCHAR []){'R','f','c','3','5','6','5','K','e','y','W','r','a','p','B','l','o','b',0} #define BCRYPT_ECCPUBLIC_BLOB (const WCHAR []){'E','C','C','P','U','B','L','I','C','B','L','O','B',0} #define BCRYPT_ECCPRIVATE_BLOB (const WCHAR []){'E','C','C','P','R','I','V','A','T','E','B','L','O','B',0} +#define BCRYPT_RSAPUBLIC_BLOB (const WCHAR []){'R','S','A','P','U','B','L','I','C','B','L','O','B',0} +#define BCRYPT_RSAPRIVATE_BLOB (const WCHAR []){'R','S','A','P','R','I','V','A','T','E','B','L','O','B',0} #define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} @@ -74,6 +76,7 @@ typedef LONG NTSTATUS; #define BCRYPT_MD4_ALGORITHM (const WCHAR []){'M','D','4',0} #define BCRYPT_MD5_ALGORITHM (const WCHAR []){'M','D','5',0} #define BCRYPT_RNG_ALGORITHM (const WCHAR []){'R','N','G',0} +#define BCRYPT_RSA_ALGORITHM (const WCHAR []){'R','S','A',0} #define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0} #define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} #define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} @@ -133,6 +136,20 @@ typedef struct _BCRYPT_ECCKEY_BLOB ULONG cbKey; } BCRYPT_ECCKEY_BLOB, *PBCRYPT_ECCKEY_BLOB; +#define BCRYPT_RSAPUBLIC_MAGIC 0x31415352 +#define BCRYPT_RSAPRIVATE_MAGIC 0x32415352 +#define BCRYPT_RSAFULLPRIVATE_MAGIC 0x33415352 + +typedef struct _BCRYPT_RSAKEY_BLOB +{ + ULONG Magic; + ULONG BitLength; + ULONG cbPublicExp; + ULONG cbModulus; + ULONG cbPrime1; + ULONG cbPrime2; +} BCRYPT_RSAKEY_BLOB; + typedef struct _BCRYPT_PKCS1_PADDING_INFO { LPCWSTR pszAlgId; -- 2.11.0

1 0

[PATCH 3/5] bcrypt: Implement BCryptVerifySignature for ECDSA signatures.
by Hans Leidekker 26 Mar '18

26 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 361 ++++++++++++++++++++++++++++++++++++++++++--- dlls/bcrypt/tests/bcrypt.c | 4 +- 2 files changed, 343 insertions(+), 22 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 82a742cbc0..d41195e00d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -27,6 +27,7 @@ #elif defined(HAVE_GNUTLS_CIPHER_INIT) #include <gnutls/gnutls.h> #include <gnutls/crypto.h> +#include <gnutls/abstract.h> #endif #include "ntstatus.h" @@ -50,9 +51,30 @@ static HINSTANCE instance; #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); +#if GNUTLS_VERSION_MAJOR < 3 +#define GNUTLS_CIPHER_AES_192_CBC 92 +#define GNUTLS_CIPHER_AES_128_GCM 93 +#define GNUTLS_CIPHER_AES_256_GCM 94 +#define GNUTLS_PK_ECC 4 + +typedef enum +{ + GNUTLS_ECC_CURVE_INVALID, + GNUTLS_ECC_CURVE_SECP224R1, + GNUTLS_ECC_CURVE_SECP256R1, + GNUTLS_ECC_CURVE_SECP384R1, + GNUTLS_ECC_CURVE_SECP521R1, +} gnutls_ecc_curve_t; +#endif + /* Not present in gnutls version < 3.0 */ -static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size); -static int (*pgnutls_cipher_add_auth)(gnutls_cipher_hd_t handle, const void *ptext, size_t ptext_size); +static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t, void *, size_t); +static int (*pgnutls_cipher_add_auth)(gnutls_cipher_hd_t, const void *, size_t); +static int (*pgnutls_pubkey_import_ecc_raw)(gnutls_pubkey_t, gnutls_ecc_curve_t, + const gnutls_datum_t *, const gnutls_datum_t *); +static gnutls_sign_algorithm_t (*pgnutls_pk_to_sign)(gnutls_pk_algorithm_t, gnutls_digest_algorithm_t); +static int (*pgnutls_pubkey_verify_hash2)(gnutls_pubkey_t, gnutls_sign_algorithm_t, unsigned int, + const gnutls_datum_t *, const gnutls_datum_t *); static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -65,14 +87,10 @@ MAKE_FUNCPTR(gnutls_global_init); MAKE_FUNCPTR(gnutls_global_set_log_function); MAKE_FUNCPTR(gnutls_global_set_log_level); MAKE_FUNCPTR(gnutls_perror); +MAKE_FUNCPTR(gnutls_pubkey_init); +MAKE_FUNCPTR(gnutls_pubkey_deinit); #undef MAKE_FUNCPTR -#if GNUTLS_VERSION_MAJOR < 3 -#define GNUTLS_CIPHER_AES_192_CBC 92 -#define GNUTLS_CIPHER_AES_128_GCM 93 -#define GNUTLS_CIPHER_AES_256_GCM 94 -#endif - static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void *tag, size_t tag_size) { return GNUTLS_E_UNKNOWN_CIPHER_TYPE; @@ -83,6 +101,24 @@ static int compat_gnutls_cipher_add_auth(gnutls_cipher_hd_t handle, const void * return GNUTLS_E_UNKNOWN_CIPHER_TYPE; } +static int compat_gnutls_pubkey_import_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_curve_t curve, + const gnutls_datum_t *x, const gnutls_datum_t *y) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + +static gnutls_sign_algorithm_t compat_gnutls_pk_to_sign(gnutls_pk_algorithm_t pk, gnutls_digest_algorithm_t hash) +{ + return GNUTLS_SIGN_UNKNOWN; +} + +static int compat_gnutls_pubkey_verify_hash2(gnutls_pubkey_t key, gnutls_sign_algorithm_t algo, + unsigned int flags, const gnutls_datum_t *hash, + const gnutls_datum_t *signature) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -114,6 +150,8 @@ static BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_global_set_log_function) LOAD_FUNCPTR(gnutls_global_set_log_level) LOAD_FUNCPTR(gnutls_perror) + LOAD_FUNCPTR(gnutls_pubkey_init); + LOAD_FUNCPTR(gnutls_pubkey_deinit); #undef LOAD_FUNCPTR if (!(pgnutls_cipher_tag = wine_dlsym( libgnutls_handle, "gnutls_cipher_tag", NULL, 0 ))) @@ -132,6 +170,21 @@ static BOOL gnutls_initialize(void) pgnutls_perror( ret ); goto fail; } + if (!(pgnutls_pubkey_import_ecc_raw = wine_dlsym( libgnutls_handle, "gnutls_pubkey_import_ecc_raw", NULL, 0 ))) + { + WARN("gnutls_pubkey_import_ecc_raw not found\n"); + pgnutls_pubkey_import_ecc_raw = compat_gnutls_pubkey_import_ecc_raw; + } + if (!(pgnutls_pk_to_sign = wine_dlsym( libgnutls_handle, "gnutls_pk_to_sign", NULL, 0 ))) + { + WARN("gnutls_pk_to_sign not found\n"); + pgnutls_pk_to_sign = compat_gnutls_pk_to_sign; + } + if (!(pgnutls_pubkey_verify_hash2 = wine_dlsym( libgnutls_handle, "gnutls_pubkey_verify_hash2", NULL, 0 ))) + { + WARN("gnutls_pubkey_verify_hash2 not found\n"); + pgnutls_pubkey_verify_hash2 = compat_gnutls_pubkey_verify_hash2; + } if (TRACE_ON( bcrypt )) { @@ -585,10 +638,10 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop const WCHAR *mode; switch (alg->mode) { - case MODE_ID_ECB: mode = BCRYPT_CHAIN_MODE_ECB; break; - case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; - case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; - default: return STATUS_NOT_IMPLEMENTED; + case MODE_ID_ECB: mode = BCRYPT_CHAIN_MODE_ECB; break; + case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; + case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; + default: return STATUS_NOT_IMPLEMENTED; } *ret_size = 64; @@ -1206,6 +1259,257 @@ static NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, con return STATUS_SUCCESS; } +struct buffer +{ + BYTE *buffer; + DWORD length; + DWORD pos; + BOOL error; +}; + +static void buffer_init( struct buffer *buffer ) +{ + buffer->buffer = NULL; + buffer->length = 0; + buffer->pos = 0; + buffer->error = FALSE; +} + +static void buffer_free( struct buffer *buffer ) +{ + heap_free( buffer->buffer ); +} + +static void buffer_append( struct buffer *buffer, BYTE *data, DWORD len ) +{ + if (!len) return; + + if (buffer->pos + len > buffer->length) + { + DWORD new_length = max( max( buffer->pos + len, buffer->length * 2 ), 64 ); + BYTE *new_buffer; + + if (!(new_buffer = heap_realloc( buffer->buffer, new_length ))) + { + ERR( "out of memory\n" ); + buffer->error = TRUE; + return; + } + + buffer->buffer = new_buffer; + buffer->length = new_length; + } + + memcpy( &buffer->buffer[buffer->pos], data, len ); + buffer->pos += len; +} + +static void buffer_append_byte( struct buffer *buffer, BYTE value ) +{ + buffer_append( buffer, &value, sizeof(value) ); +} + +static void buffer_append_asn1_length( struct buffer *buffer, DWORD length ) +{ + DWORD num_bytes; + + if (length < 128) + { + buffer_append_byte( buffer, length ); + return; + } + + if (length <= 0xff) num_bytes = 1; + else if (length <= 0xffff) num_bytes = 2; + else if (length <= 0xffffff) num_bytes = 3; + else num_bytes = 4; + + buffer_append_byte( buffer, 0x80 | num_bytes ); + while (num_bytes--) buffer_append_byte( buffer, length >> (num_bytes * 8) ); +} + +static void buffer_append_asn1_integer( struct buffer *buffer, BYTE *data, DWORD len ) +{ + DWORD leading_zero = (*data & 0x80) != 0; + + buffer_append_byte( buffer, 0x02 ); /* tag */ + buffer_append_asn1_length( buffer, len + leading_zero ); + if (leading_zero) buffer_append_byte( buffer, 0 ); + buffer_append( buffer, data, len ); +} + +static void buffer_append_asn1_sequence( struct buffer *buffer, struct buffer *content ) +{ + if (content->error) + { + buffer->error = TRUE; + return; + } + + buffer_append_byte( buffer, 0x30 ); /* tag */ + buffer_append_asn1_length( buffer, content->pos ); + buffer_append( buffer, content->buffer, content->pos ); +} + +static void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE *s, DWORD s_len ) +{ + struct buffer value; + + buffer_init( &value ); + buffer_append_asn1_integer( &value, r, r_len ); + buffer_append_asn1_integer( &value, s, s_len ); + buffer_append_asn1_sequence( buffer, &value ); + buffer_free( &value ); +} + +static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnutls_key ) +{ + BCRYPT_ECCKEY_BLOB *ecc_blob; + gnutls_ecc_curve_t curve; + gnutls_datum_t x, y; + int ret; + + switch (key->alg_id) + { + case ALG_ID_ECDSA_P256: curve = GNUTLS_ECC_CURVE_SECP256R1; break; + case ALG_ID_ECDSA_P384: curve = GNUTLS_ECC_CURVE_SECP384R1; break; + + default: + FIXME( "algorithm %u not yet supported\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + + if ((ret = pgnutls_pubkey_init( gnutls_key ))) + { + 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); + x.size = ecc_blob->cbKey; + y.data = key->u.a.pubkey + sizeof(*ecc_blob) + ecc_blob->cbKey; + y.size = ecc_blob->cbKey; + + if ((ret = pgnutls_pubkey_import_ecc_raw( *gnutls_key, curve, &x, &y ))) + { + pgnutls_perror( ret ); + pgnutls_pubkey_deinit( *gnutls_key ); + return STATUS_INTERNAL_ERROR; + } + + 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 ); + + default: + FIXME("algorithm %u not yet supported\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } +} + +static NTSTATUS prepare_gnutls_signature_ecc( struct key *key, UCHAR *signature, ULONG signature_len, + gnutls_datum_t *gnutls_signature ) +{ + struct buffer buffer; + DWORD r_len = signature_len / 2; + DWORD s_len = r_len; + BYTE *r = signature; + BYTE *s = signature + r_len; + + buffer_init( &buffer ); + buffer_append_asn1_r_s( &buffer, r, r_len, s, s_len ); + if (buffer.error) + { + buffer_free( &buffer ); + return STATUS_NO_MEMORY; + } + + gnutls_signature->data = buffer.buffer; + gnutls_signature->size = buffer.pos; + return STATUS_SUCCESS; +} + +static NTSTATUS prepare_gnutls_signature( struct key *key, UCHAR *signature, ULONG signature_len, + gnutls_datum_t *gnutls_signature ) +{ + switch (key->alg_id) + { + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + return prepare_gnutls_signature_ecc( key, signature, signature_len, gnutls_signature ); + + default: + FIXME( "algorithm %u not yet supported\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } +} + +static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, + UCHAR *signature, ULONG signature_len, DWORD flags ) +{ + gnutls_digest_algorithm_t hash_alg; + 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; + + if (flags) FIXME( "flags %08x not supported\n", flags ); + + /* only the hash size must match, not the actual hash function */ + switch (hash_len) + { + case 32: hash_alg = GNUTLS_DIG_SHA256; break; + case 48: hash_alg = GNUTLS_DIG_SHA384; break; + + default: + FIXME( "hash size %u not yet supported\n", hash_len ); + return STATUS_INVALID_SIGNATURE; + } + + switch (key->alg_id) + { + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + pk_alg = GNUTLS_PK_ECC; + break; + + default: + FIXME( "algorithm %u not yet supported\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + + if ((sign_alg = pgnutls_pk_to_sign( pk_alg, hash_alg )) == GNUTLS_SIGN_UNKNOWN) + { + FIXME("GnuTLS does not support algorithm %u with hash len %u\n", key->alg_id, hash_len ); + return STATUS_NOT_IMPLEMENTED; + } + + if ((status = import_gnutls_pubkey( key, &gnutls_key ))) return status; + if ((status = prepare_gnutls_signature( key, signature, signature_len, &gnutls_signature ))) + { + pgnutls_pubkey_deinit( gnutls_key ); + return status; + } + + gnutls_hash.data = hash; + gnutls_hash.size = hash_len; + ret = pgnutls_pubkey_verify_hash2( gnutls_key, sign_alg, 0, &gnutls_hash, &gnutls_signature ); + + heap_free( gnutls_signature.data ); + pgnutls_pubkey_deinit( gnutls_key ); + return (ret < 0) ? STATUS_INVALID_SIGNATURE : STATUS_SUCCESS; +} + static NTSTATUS key_destroy( struct key *key ) { if (key_is_symmetric( key )) @@ -1227,12 +1531,12 @@ static NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, cons case ALG_ID_AES: switch (alg->mode) { - case MODE_ID_ECB: - case MODE_ID_CBC: - break; - default: - FIXME( "mode %u not supported\n", alg->mode ); - return STATUS_NOT_SUPPORTED; + case MODE_ID_ECB: + case MODE_ID_CBC: + break; + default: + FIXME( "mode %u not supported\n", alg->mode ); + return STATUS_NOT_SUPPORTED; } break; @@ -1368,6 +1672,13 @@ static NTSTATUS key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len ) return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, + UCHAR *signature, ULONG signature_len, DWORD flags ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->u.s.ref_encrypt) CCCryptorRelease( key->u.s.ref_encrypt ); @@ -1433,6 +1744,13 @@ static NTSTATUS key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len ) return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, + UCHAR *signature, ULONG signature_len, DWORD flags ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { ERR( "support for keys not available at build time\n" ); @@ -1637,10 +1955,13 @@ NTSTATUS WINAPI BCryptVerifySignature( BCRYPT_KEY_HANDLE handle, void *padding, { struct key *key = handle; - FIXME( "%p, %p, %p, %u, %p, %u, %08x: stub!\n", handle, padding, hash, hash_len, signature, signature_len, flags ); + TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", handle, padding, hash, hash_len, signature, signature_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - return STATUS_NOT_IMPLEMENTED; + if (!hash || !hash_len || !signature || !signature_len) return STATUS_INVALID_PARAMETER; + if (key_is_symmetric( key )) return STATUS_NOT_SUPPORTED; + + return key_asymmetric_verify( key, padding, hash, hash_len, signature, signature_len, flags ); } NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index fa244d1924..57d04882b5 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1486,10 +1486,10 @@ static void test_ECDSA(void) ok(!status, "BCryptImportKeyPair failed: %08x\n", status); status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); - todo_wine ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); + ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); - todo_wine ok(!status, "BCryptVerifySignature failed: %08x\n", status); + ok(!status, "BCryptVerifySignature failed: %08x\n", status); pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0); -- 2.11.0

1 0

[PATCH 2/5] bcrypt: Implement importing of ECDSA keys.
by Hans Leidekker 26 Mar '18

26 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt.spec | 4 +- dlls/bcrypt/bcrypt_main.c | 173 +++++++++++++++++++++++++++++++++++++++++---- dlls/bcrypt/tests/bcrypt.c | 4 +- dlls/ncrypt/ncrypt.spec | 4 +- include/bcrypt.h | 2 + 5 files changed, 167 insertions(+), 20 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 28c2394ce4..78824d73b3 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -32,7 +32,7 @@ @ stdcall BCryptHash(ptr ptr long ptr long ptr long) @ stdcall BCryptHashData(ptr ptr long long) @ stdcall BCryptImportKey(ptr ptr wstr ptr ptr long ptr long long) -@ stub BCryptImportKeyPair +@ stdcall BCryptImportKeyPair(ptr ptr wstr ptr ptr long long) @ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) @ stub BCryptQueryContextConfiguration @ stub BCryptQueryContextFunctionConfiguration @@ -50,7 +50,7 @@ @ stub BCryptSignHash @ stub BCryptUnregisterConfigChangeNotify @ stdcall BCryptUnregisterProvider(wstr) -@ stub BCryptVerifySignature +@ stdcall BCryptVerifySignature(ptr ptr ptr long ptr long long) @ stub GetAsymmetricEncryptionInterface @ stub GetCipherInterface @ stub GetHashInterface diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 57cb3632d5..82a742cbc0 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -220,7 +220,9 @@ enum alg_id ALG_ID_SHA1, ALG_ID_SHA256, ALG_ID_SHA384, - ALG_ID_SHA512 + ALG_ID_SHA512, + ALG_ID_ECDSA_P256, + ALG_ID_ECDSA_P384, }; enum mode_id @@ -251,7 +253,9 @@ alg_props[] = /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM, FALSE }, /* ALG_ID_SHA256 */ { 286, 32, 512, BCRYPT_SHA256_ALGORITHM, FALSE }, /* ALG_ID_SHA384 */ { 382, 48, 1024, BCRYPT_SHA384_ALGORITHM, FALSE }, - /* ALG_ID_SHA512 */ { 382, 64, 1024, BCRYPT_SHA512_ALGORITHM, FALSE } + /* ALG_ID_SHA512 */ { 382, 64, 1024, BCRYPT_SHA512_ALGORITHM, FALSE }, + /* ALG_ID_ECDSA_P256 */ { 0, 0, 0, BCRYPT_ECDSA_P256_ALGORITHM, FALSE }, + /* ALG_ID_ECDSA_P384 */ { 0, 0, 0, BCRYPT_ECDSA_P384_ALGORITHM, FALSE }, }; struct algorithm @@ -327,6 +331,8 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256; else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; else if (!strcmpW( id, BCRYPT_SHA512_ALGORITHM )) alg_id = ALG_ID_SHA512; + else if (!strcmpW( id, BCRYPT_ECDSA_P256_ALGORITHM )) alg_id = ALG_ID_ECDSA_P256; + else if (!strcmpW( id, BCRYPT_ECDSA_P384_ALGORITHM )) alg_id = ALG_ID_ECDSA_P384; else { FIXME( "algorithm %s not supported\n", debugstr_w(id) ); @@ -869,6 +875,12 @@ struct key_symmetric ULONG secret_len; }; +struct key_asymmetric +{ + UCHAR *pubkey; + ULONG pubkey_len; +}; + struct key { struct object hdr; @@ -876,6 +888,7 @@ struct key union { struct key_symmetric s; + struct key_asymmetric a; } u; }; @@ -890,6 +903,12 @@ struct key_symmetric ULONG secret_len; }; +struct key_asymmetric +{ + UCHAR *pubkey; + ULONG pubkey_len; +}; + struct key { struct object hdr; @@ -897,6 +916,7 @@ struct key union { struct key_symmetric s; + struct key_asymmetric a; } u; }; #else @@ -954,18 +974,28 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) { UCHAR *buffer; - if (!key_is_symmetric( key_orig )) return STATUS_NOT_IMPLEMENTED; + memset( key_copy, 0, sizeof(*key_copy) ); + key_copy->hdr = key_orig->hdr; + key_copy->alg_id = key_orig->alg_id; - if (!(buffer = heap_alloc( key_orig->u.s.secret_len ))) return STATUS_NO_MEMORY; - memcpy( buffer, key_orig->u.s.secret, key_orig->u.s.secret_len ); + if (key_is_symmetric( key_orig )) + { + if (!(buffer = heap_alloc( key_orig->u.s.secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->u.s.secret, key_orig->u.s.secret_len ); - memset( key_copy, 0, sizeof(*key_copy) ); - key_copy->hdr = key_orig->hdr; - key_copy->alg_id = key_orig->alg_id; - key_copy->u.s.mode = key_orig->u.s.mode; - key_copy->u.s.block_size = key_orig->u.s.block_size; - key_copy->u.s.secret = buffer; - key_copy->u.s.secret_len = key_orig->u.s.secret_len; + key_copy->u.s.mode = key_orig->u.s.mode; + key_copy->u.s.block_size = key_orig->u.s.block_size; + key_copy->u.s.secret = buffer; + key_copy->u.s.secret_len = key_orig->u.s.secret_len; + } + else + { + if (!(buffer = heap_alloc( 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.pubkey = buffer; + key_copy->u.a.pubkey_len = key_orig->u.a.pubkey_len; + } return STATUS_SUCCESS; } @@ -1149,10 +1179,41 @@ static NTSTATUS key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len ) return STATUS_SUCCESS; } +static NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, const UCHAR *pubkey, ULONG pubkey_len ) +{ + UCHAR *buffer; + + if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; + + switch (alg->id) + { + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + break; + + default: + FIXME( "algorithm %u not supported\n", alg->id ); + return STATUS_NOT_SUPPORTED; + } + + if (!(buffer = heap_alloc( pubkey_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, pubkey, pubkey_len ); + + key->alg_id = alg->id; + key->u.a.pubkey = buffer; + key->u.a.pubkey_len = pubkey_len; + + return STATUS_SUCCESS; +} + static NTSTATUS key_destroy( struct key *key ) { - if (key->u.s.handle) pgnutls_cipher_deinit( key->u.s.handle ); - heap_free( key->u.s.secret ); + if (key_is_symmetric( key )) + { + if (key->u.s.handle) pgnutls_cipher_deinit( key->u.s.handle ); + heap_free( key->u.s.secret ); + } + else heap_free( key->u.a.pubkey ); heap_free( key ); return STATUS_SUCCESS; } @@ -1315,6 +1376,12 @@ static NTSTATUS key_destroy( struct key *key ) heap_free( key ); return STATUS_SUCCESS; } + +static NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, const UCHAR *pubkey, ULONG pubkey_len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} #else static NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { @@ -1383,6 +1450,12 @@ static inline BOOL key_is_symmetric( struct key *key ) ERR( "support for keys not available at build time\n" ); return FALSE; } + +static NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, const UCHAR *pubkey, ULONG pubkey_len ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} #endif NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle, @@ -1498,6 +1571,78 @@ NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE return STATUS_SUCCESS; } +NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, + BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len, ULONG flags ) +{ + struct algorithm *alg = algorithm; + NTSTATUS status; + struct key *key; + + TRACE( "%p, %p, %s, %p, %p, %u, %08x\n", algorithm, decrypt_key, debugstr_w(type), ret_key, input, + input_len, flags ); + + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + if (!ret_key || !type || !input) return STATUS_INVALID_PARAMETER; + if (decrypt_key) + { + FIXME( "decryption of key not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + if (!strcmpW( type, BCRYPT_ECCPUBLIC_BLOB )) + { + BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; + DWORD key_size, magic; + + if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; + + switch (alg->id) + { + case ALG_ID_ECDSA_P256: + key_size = 32; + magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + break; + + case ALG_ID_ECDSA_P384: + key_size = 48; + magic = BCRYPT_ECDSA_PUBLIC_P384_MAGIC; + break; + + default: + FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(type) ); + return STATUS_NOT_SUPPORTED; + } + + if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; + if (ecc_blob->cbKey != key_size) return STATUS_INVALID_PARAMETER; + + if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; + key->hdr.magic = MAGIC_KEY; + if ((status = key_asymmetric_init( key, alg, (BYTE *)ecc_blob, sizeof(*ecc_blob) + ecc_blob->cbKey * 2 ))) + { + heap_free( key ); + return status; + } + + *ret_key = key; + return STATUS_SUCCESS; + } + + FIXME( "unsupported key type %s\n", debugstr_w(type) ); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS WINAPI BCryptVerifySignature( BCRYPT_KEY_HANDLE handle, void *padding, UCHAR *hash, ULONG hash_len, + UCHAR *signature, ULONG signature_len, ULONG flags ) +{ + struct key *key = handle; + + FIXME( "%p, %p, %p, %u, %p, %u, %08x: stub!\n", handle, padding, hash, hash_len, signature, signature_len, flags ); + + if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) { struct key *key = handle; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 57d04882b5..fa244d1924 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1486,10 +1486,10 @@ static void test_ECDSA(void) ok(!status, "BCryptImportKeyPair failed: %08x\n", status); status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); - ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); + todo_wine ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); - ok(!status, "BCryptVerifySignature failed: %08x\n", status); + todo_wine ok(!status, "BCryptVerifySignature failed: %08x\n", status); pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0); diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index d0f0f56cc4..e7b12e0059 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -34,7 +34,7 @@ @ stdcall BCryptHash(ptr ptr long ptr long ptr long) bcrypt.BCryptHash @ stdcall BCryptHashData(ptr ptr long long) bcrypt.BCryptHashData @ stdcall BCryptImportKey(ptr ptr wstr ptr ptr long ptr long long) bcrypt.BCryptImportKey -@ stub BCryptImportKeyPair +@ stdcall BCryptImportKeyPair(ptr ptr wstr ptr ptr long long) bcrypt.BCryptImportKeyPair @ stub BCryptKeyDerivation @ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) bcrypt.BCryptOpenAlgorithmProvider @ stub BCryptQueryContextConfiguration @@ -53,7 +53,7 @@ @ stub BCryptSignHash @ stub BCryptUnregisterConfigChangeNotify @ stdcall BCryptUnregisterProvider(wstr) bcrypt.BCryptUnregisterProvider -@ stub BCryptVerifySignature +@ stdcall BCryptVerifySignature(ptr ptr ptr long ptr long long) bcrypt.BCryptVerifySignature @ stub GetIsolationServerInterface @ stub GetKeyStorageInterface @ stub GetSChannelInterface diff --git a/include/bcrypt.h b/include/bcrypt.h index 717d77c731..f28b0d395d 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -211,8 +211,10 @@ NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *); NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptHash(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, PUCHAR, ULONG); NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptImportKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); NTSTATUS WINAPI BCryptSetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDuplicateHash(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG); +NTSTATUS WINAPI BCryptVerifySignature(BCRYPT_KEY_HANDLE, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG); #endif /* __WINE_BCRYPT_H */ -- 2.11.0

1 0

[PATCH 1/5] bcrypt: Preparation for asymmetric keys.
by Hans Leidekker 26 Mar '18

26 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 395 ++++++++++++++++++++++++++-------------------- 1 file changed, 223 insertions(+), 172 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 69d5129a7d..57cb3632d5 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -233,21 +233,25 @@ enum mode_id #define MAX_HASH_OUTPUT_BYTES 64 #define MAX_HASH_BLOCK_BITS 1024 -static const struct { - ULONG object_length; - ULONG hash_length; - ULONG block_bits; +static const struct +{ + ULONG object_length; + ULONG hash_length; + ULONG block_bits; const WCHAR *alg_name; -} alg_props[] = { - /* ALG_ID_AES */ { 654, 0, 0, BCRYPT_AES_ALGORITHM }, - /* ALG_ID_MD2 */ { 270, 16, 128, BCRYPT_MD2_ALGORITHM }, - /* ALG_ID_MD4 */ { 270, 16, 512, BCRYPT_MD4_ALGORITHM }, - /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM }, - /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM }, - /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM }, - /* ALG_ID_SHA256 */ { 286, 32, 512, BCRYPT_SHA256_ALGORITHM }, - /* ALG_ID_SHA384 */ { 382, 48, 1024, BCRYPT_SHA384_ALGORITHM }, - /* ALG_ID_SHA512 */ { 382, 64, 1024, BCRYPT_SHA512_ALGORITHM } + BOOL symmetric; +} +alg_props[] = +{ + /* ALG_ID_AES */ { 654, 0, 0, BCRYPT_AES_ALGORITHM, TRUE }, + /* ALG_ID_MD2 */ { 270, 16, 128, BCRYPT_MD2_ALGORITHM, FALSE }, + /* ALG_ID_MD4 */ { 270, 16, 512, BCRYPT_MD4_ALGORITHM, FALSE }, + /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM, FALSE }, + /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM, FALSE }, + /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM, FALSE }, + /* ALG_ID_SHA256 */ { 286, 32, 512, BCRYPT_SHA256_ALGORITHM, FALSE }, + /* ALG_ID_SHA384 */ { 382, 48, 1024, BCRYPT_SHA384_ALGORITHM, FALSE }, + /* ALG_ID_SHA512 */ { 382, 64, 1024, BCRYPT_SHA512_ALGORITHM, FALSE } }; struct algorithm @@ -856,21 +860,28 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se } #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +struct key_symmetric +{ + enum mode_id mode; + ULONG block_size; + gnutls_cipher_hd_t handle; + UCHAR *secret; + ULONG secret_len; +}; + struct key { - struct object hdr; - enum alg_id alg_id; - enum mode_id mode; - ULONG block_size; - gnutls_cipher_hd_t handle; - UCHAR *secret; - ULONG secret_len; + struct object hdr; + enum alg_id alg_id; + union + { + struct key_symmetric s; + } u; }; + #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -struct key +struct key_symmetric { - struct object hdr; - enum alg_id alg_id; enum mode_id mode; ULONG block_size; CCCryptorRef ref_encrypt; @@ -878,16 +889,39 @@ struct key UCHAR *secret; ULONG secret_len; }; -#else + struct key { struct object hdr; + enum alg_id alg_id; + union + { + struct key_symmetric s; + } u; +}; +#else +struct key_symmetric +{ enum mode_id mode; ULONG block_size; }; + +struct key +{ + struct object hdr; + union + { + struct key_symmetric s; + } u; +}; #endif #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +static inline BOOL key_is_symmetric( struct key *key ) +{ + return alg_props[key->alg_id].symmetric; +} + static ULONG get_block_size( struct algorithm *alg ) { ULONG ret = 0, size = sizeof(ret); @@ -900,15 +934,15 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) { BCRYPT_KEY_DATA_BLOB_HEADER *header = (BCRYPT_KEY_DATA_BLOB_HEADER *)output; - ULONG req_size = sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + key->secret_len; + ULONG req_size = sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + key->u.s.secret_len; *size = req_size; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; - header->cbKeyData = key->secret_len; - memcpy( &header[1], key->secret, key->secret_len ); + header->cbKeyData = key->u.s.secret_len; + memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); return STATUS_SUCCESS; } @@ -920,23 +954,25 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) { UCHAR *buffer; - if (!(buffer = heap_alloc( key_orig->secret_len ))) return STATUS_NO_MEMORY; - memcpy( buffer, key_orig->secret, key_orig->secret_len ); + if (!key_is_symmetric( key_orig )) return STATUS_NOT_IMPLEMENTED; + + if (!(buffer = heap_alloc( key_orig->u.s.secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->u.s.secret, key_orig->u.s.secret_len ); memset( key_copy, 0, sizeof(*key_copy) ); - key_copy->hdr = key_orig->hdr; - key_copy->alg_id = key_orig->alg_id; - key_copy->mode = key_orig->mode; - key_copy->block_size = key_orig->block_size; - key_copy->secret = buffer; - key_copy->secret_len = key_orig->secret_len; + key_copy->hdr = key_orig->hdr; + key_copy->alg_id = key_orig->alg_id; + key_copy->u.s.mode = key_orig->u.s.mode; + key_copy->u.s.block_size = key_orig->u.s.block_size; + key_copy->u.s.secret = buffer; + key_copy->u.s.secret_len = key_orig->u.s.secret_len; return STATUS_SUCCESS; } #endif #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) -static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) +static NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; @@ -952,15 +988,15 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_NOT_SUPPORTED; } - if (!(key->block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; + if (!(key->u.s.block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); - key->alg_id = alg->id; - key->mode = alg->mode; - key->handle = 0; /* initialized on first use */ - key->secret = buffer; - key->secret_len = secret_len; + key->alg_id = alg->id; + key->u.s.mode = alg->mode; + key->u.s.handle = 0; /* initialized on first use */ + key->u.s.secret = buffer; + key->u.s.secret_len = secret_len; return STATUS_SUCCESS; } @@ -971,17 +1007,17 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val { if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) { - key->mode = MODE_ID_ECB; + key->u.s.mode = MODE_ID_ECB; return STATUS_SUCCESS; } else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) { - key->mode = MODE_ID_CBC; + key->u.s.mode = MODE_ID_CBC; return STATUS_SUCCESS; } else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) { - key->mode = MODE_ID_GCM; + key->u.s.mode = MODE_ID_GCM; return STATUS_SUCCESS; } else @@ -1001,53 +1037,54 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { case ALG_ID_AES: WARN( "handle block size\n" ); - switch (key->mode) + switch (key->u.s.mode) { - case MODE_ID_GCM: - if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_GCM; - if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_GCM; - break; - case MODE_ID_ECB: /* can be emulated with CBC + empty IV */ - case MODE_ID_CBC: - if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_CBC; - if (key->secret_len == 24) return GNUTLS_CIPHER_AES_192_CBC; - if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_CBC; - break; - default: - break; + case MODE_ID_GCM: + if (key->u.s.secret_len == 16) return GNUTLS_CIPHER_AES_128_GCM; + if (key->u.s.secret_len == 32) return GNUTLS_CIPHER_AES_256_GCM; + break; + case MODE_ID_ECB: /* can be emulated with CBC + empty IV */ + case MODE_ID_CBC: + if (key->u.s.secret_len == 16) return GNUTLS_CIPHER_AES_128_CBC; + if (key->u.s.secret_len == 24) return GNUTLS_CIPHER_AES_192_CBC; + if (key->u.s.secret_len == 32) return GNUTLS_CIPHER_AES_256_CBC; + break; + default: + break; } - FIXME( "aes mode %u with key length %u not supported\n", key->mode, key->secret_len ); + FIXME( "AES mode %u with key length %u not supported\n", key->u.s.mode, key->u.s.secret_len ); return GNUTLS_CIPHER_UNKNOWN; + default: FIXME( "algorithm %u not supported\n", key->alg_id ); return GNUTLS_CIPHER_UNKNOWN; } } -static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) +static NTSTATUS key_symmetric_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { gnutls_cipher_algorithm_t cipher; gnutls_datum_t secret, vector; int ret; - if (key->handle) + if (key->u.s.handle) { - pgnutls_cipher_deinit( key->handle ); - key->handle = NULL; + pgnutls_cipher_deinit( key->u.s.handle ); + key->u.s.handle = NULL; } if ((cipher = get_gnutls_cipher( key )) == GNUTLS_CIPHER_UNKNOWN) return STATUS_NOT_SUPPORTED; - secret.data = key->secret; - secret.size = key->secret_len; + secret.data = key->u.s.secret; + secret.size = key->u.s.secret_len; if (iv) { vector.data = iv; vector.size = iv_len; } - if ((ret = pgnutls_cipher_init( &key->handle, cipher, &secret, iv ? &vector : NULL ))) + if ((ret = pgnutls_cipher_init( &key->u.s.handle, cipher, &secret, iv ? &vector : NULL ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1056,11 +1093,13 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) return STATUS_SUCCESS; } -static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +static NTSTATUS key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) { int ret; - if ((ret = pgnutls_cipher_add_auth( key->handle, auth_data, len ))) + if (!auth_data) return STATUS_SUCCESS; + + if ((ret = pgnutls_cipher_add_auth( key->u.s.handle, auth_data, len ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1069,12 +1108,12 @@ static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len return STATUS_SUCCESS; } -static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len ) +static NTSTATUS key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) { int ret; - if ((ret = pgnutls_cipher_encrypt2( key->handle, input, input_len, output, output_len ))) + if ((ret = pgnutls_cipher_encrypt2( key->u.s.handle, input, input_len, output, output_len ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1083,12 +1122,12 @@ static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } -static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len ) +static NTSTATUS key_symmetric_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) { int ret; - if ((ret = pgnutls_cipher_decrypt2( key->handle, input, input_len, output, output_len ))) + if ((ret = pgnutls_cipher_decrypt2( key->u.s.handle, input, input_len, output, output_len ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1097,11 +1136,11 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } -static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +static NTSTATUS key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len ) { int ret; - if ((ret = pgnutls_cipher_tag( key->handle, tag, len ))) + if ((ret = pgnutls_cipher_tag( key->u.s.handle, tag, len ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1112,13 +1151,13 @@ static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) static NTSTATUS key_destroy( struct key *key ) { - if (key->handle) pgnutls_cipher_deinit( key->handle ); - heap_free( key->secret ); + if (key->u.s.handle) pgnutls_cipher_deinit( key->u.s.handle ); + heap_free( key->u.s.secret ); heap_free( key ); return STATUS_SUCCESS; } #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) +static NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; @@ -1141,16 +1180,16 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_NOT_SUPPORTED; } - if (!(key->block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; + if (!(key->u.s.block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); - key->alg_id = alg->id; - key->mode = alg->mode; - key->ref_encrypt = NULL; /* initialized on first use */ - key->ref_decrypt = NULL; - key->secret = buffer; - key->secret_len = secret_len; + key->alg_id = alg->id; + key->u.s.mode = alg->mode; + key->u.s.ref_encrypt = NULL; /* initialized on first use */ + key->u.s.ref_decrypt = NULL; + key->u.s.secret = buffer; + key->u.s.secret_len = secret_len; return STATUS_SUCCESS; } @@ -1161,12 +1200,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val { if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) { - key->mode = MODE_ID_ECB; + key->u.s.mode = MODE_ID_ECB; return STATUS_SUCCESS; } else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) { - key->mode = MODE_ID_CBC; + key->u.s.mode = MODE_ID_CBC; return STATUS_SUCCESS; } else @@ -1182,64 +1221,64 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val static CCMode get_cryptor_mode( struct key *key ) { - switch (key->mode) + switch (key->u.s.mode) { case MODE_ID_ECB: return kCCModeECB; case MODE_ID_CBC: return kCCModeCBC; default: - FIXME( "unsupported mode %u\n", key->mode ); + FIXME( "unsupported mode %u\n", key->u.s.mode ); return 0; } } -static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) +static NTSTATUS key_symmetric_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { CCCryptorStatus status; CCMode mode; if (!(mode = get_cryptor_mode( key ))) return STATUS_NOT_SUPPORTED; - if (key->ref_encrypt) + if (key->u.s.ref_encrypt) { - CCCryptorRelease( key->ref_encrypt ); - key->ref_encrypt = NULL; + CCCryptorRelease( key->u.s.ref_encrypt ); + key->u.s.ref_encrypt = NULL; } - if (key->ref_decrypt) + if (key->u.s.ref_decrypt) { - CCCryptorRelease( key->ref_decrypt ); - key->ref_decrypt = NULL; + CCCryptorRelease( key->u.s.ref_decrypt ); + key->u.s.ref_decrypt = NULL; } - if ((status = CCCryptorCreateWithMode( kCCEncrypt, mode, kCCAlgorithmAES128, ccNoPadding, iv, key->secret, - key->secret_len, NULL, 0, 0, 0, &key->ref_encrypt )) != kCCSuccess) + if ((status = CCCryptorCreateWithMode( kCCEncrypt, mode, kCCAlgorithmAES128, ccNoPadding, iv, key->u.s.secret, + key->u.s.secret_len, NULL, 0, 0, 0, &key->u.s.ref_encrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); return STATUS_INTERNAL_ERROR; } - if ((status = CCCryptorCreateWithMode( kCCDecrypt, mode, kCCAlgorithmAES128, ccNoPadding, iv, key->secret, - key->secret_len, NULL, 0, 0, 0, &key->ref_decrypt )) != kCCSuccess) + if ((status = CCCryptorCreateWithMode( kCCDecrypt, mode, kCCAlgorithmAES128, ccNoPadding, iv, key->u.s.secret, + key->u.s.secret_len, NULL, 0, 0, 0, &key->u.s.ref_decrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); - CCCryptorRelease( key->ref_encrypt ); - key->ref_encrypt = NULL; + CCCryptorRelease( key->u.s.ref_encrypt ); + key->u.s.ref_encrypt = NULL; return STATUS_INTERNAL_ERROR; } return STATUS_SUCCESS; } -static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +static NTSTATUS key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) { FIXME( "not implemented on Mac\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len ) +static NTSTATUS key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) { CCCryptorStatus status; - if ((status = CCCryptorUpdate( key->ref_encrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) + if ((status = CCCryptorUpdate( key->u.s.ref_encrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) { WARN( "CCCryptorUpdate failed %d\n", status ); return STATUS_INTERNAL_ERROR; @@ -1248,12 +1287,12 @@ static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } -static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len ) +static NTSTATUS key_symmetric_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) { CCCryptorStatus status; - if ((status = CCCryptorUpdate( key->ref_decrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) + if ((status = CCCryptorUpdate( key->u.s.ref_decrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) { WARN( "CCCryptorUpdate failed %d\n", status ); return STATUS_INTERNAL_ERROR; @@ -1262,7 +1301,7 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } -static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +static NTSTATUS key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len ) { FIXME( "not implemented on Mac\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1270,14 +1309,14 @@ static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) static NTSTATUS key_destroy( struct key *key ) { - if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); - if (key->ref_decrypt) CCCryptorRelease( key->ref_decrypt ); - heap_free( key->secret ); + if (key->u.s.ref_encrypt) CCCryptorRelease( key->u.s.ref_encrypt ); + if (key->u.s.ref_decrypt) CCCryptorRelease( key->u.s.ref_decrypt ); + heap_free( key->u.s.secret ); heap_free( key ); return STATUS_SUCCESS; } #else -static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) +static NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1295,33 +1334,33 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) +static NTSTATUS key_symmetric_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +static NTSTATUS key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len ) +static NTSTATUS key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len ) +static NTSTATUS key_symmetric_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +static NTSTATUS key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1338,6 +1377,12 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } + +static inline BOOL key_is_symmetric( struct key *key ) +{ + ERR( "support for keys not available at build time\n" ); + return FALSE; +} #endif NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle, @@ -1356,7 +1401,7 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; - if ((status = key_init( key, alg, secret, secret_len ))) + if ((status = key_symmetric_init( key, alg, secret, secret_len ))) { heap_free( key ); return status; @@ -1476,13 +1521,18 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!key_is_symmetric( key )) + { + FIXME( "encryption with asymmetric keys not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not implemented\n", flags ); return STATUS_NOT_IMPLEMENTED; } - if (key->mode == MODE_ID_GCM) + if (key->u.s.mode == MODE_ID_GCM) { BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; @@ -1493,7 +1543,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (auth_info->dwFlags & BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG) FIXME( "call chaining not implemented\n" ); - if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + if ((status = key_symmetric_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) return status; *ret_len = input_len; @@ -1501,44 +1551,43 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (input && !output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; - if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) - return status; - if ((status = key_encrypt( key, input, input_len, output, output_len ))) + if ((status = key_symmetric_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) return status; + if ((status = key_symmetric_encrypt( key, input, input_len, output, output_len ))) return status; - return key_get_tag( key, auth_info->pbTag, auth_info->cbTag ); + return key_symmetric_get_tag( key, auth_info->pbTag, auth_info->cbTag ); } - if ((status = key_set_params( key, iv, iv_len ))) return status; - + if ((status = key_symmetric_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; if (flags & BCRYPT_BLOCK_PADDING) - *ret_len = (input_len + key->block_size) & ~(key->block_size - 1); - else if (input_len & (key->block_size - 1)) + *ret_len = (input_len + key->u.s.block_size) & ~(key->u.s.block_size - 1); + else if (input_len & (key->u.s.block_size - 1)) return STATUS_INVALID_BUFFER_SIZE; if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; - if (key->mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; + if (key->u.s.mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; src = input; dst = output; - while (bytes_left >= key->block_size) + while (bytes_left >= key->u.s.block_size) { - if ((status = key_encrypt( key, src, key->block_size, dst, key->block_size ))) return status; - if (key->mode == MODE_ID_ECB && (status = key_set_params( key, NULL, 0 ))) return status; - bytes_left -= key->block_size; - src += key->block_size; - dst += key->block_size; + if ((status = key_symmetric_encrypt( key, src, key->u.s.block_size, dst, key->u.s.block_size ))) + return status; + if (key->u.s.mode == MODE_ID_ECB && (status = key_symmetric_set_params( key, NULL, 0 ))) return status; + bytes_left -= key->u.s.block_size; + src += key->u.s.block_size; + dst += key->u.s.block_size; } if (flags & BCRYPT_BLOCK_PADDING) { - if (!(buf = heap_alloc( key->block_size ))) return STATUS_NO_MEMORY; + if (!(buf = heap_alloc( key->u.s.block_size ))) return STATUS_NO_MEMORY; memcpy( buf, src, bytes_left ); - memset( buf + bytes_left, key->block_size - bytes_left, key->block_size - bytes_left ); - status = key_encrypt( key, buf, key->block_size, dst, key->block_size ); + memset( buf + bytes_left, key->u.s.block_size - bytes_left, key->u.s.block_size - bytes_left ); + status = key_symmetric_encrypt( key, buf, key->u.s.block_size, dst, key->u.s.block_size ); heap_free( buf ); } @@ -1558,13 +1607,18 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!key_is_symmetric( key )) + { + FIXME( "decryption with asymmetric keys not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not supported\n", flags ); return STATUS_NOT_IMPLEMENTED; } - if (key->mode == MODE_ID_GCM) + if (key->u.s.mode == MODE_ID_GCM) { BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; UCHAR tag[16]; @@ -1574,7 +1628,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; - if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + if ((status = key_symmetric_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) return status; *ret_len = input_len; @@ -1582,58 +1636,55 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; - if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) - return status; - if ((status = key_decrypt( key, input, input_len, output, output_len ))) + if ((status = key_symmetric_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) return status; + if ((status = key_symmetric_decrypt( key, input, input_len, output, output_len ))) return status; - if ((status = key_get_tag( key, tag, sizeof(tag) ))) - return status; - if (memcmp( tag, auth_info->pbTag, auth_info->cbTag )) - return STATUS_AUTH_TAG_MISMATCH; + if ((status = key_symmetric_get_tag( key, tag, sizeof(tag) ))) return status; + if (memcmp( tag, auth_info->pbTag, auth_info->cbTag )) return STATUS_AUTH_TAG_MISMATCH; return STATUS_SUCCESS; } - if ((status = key_set_params( key, iv, iv_len ))) return status; + if ((status = key_symmetric_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; - if (input_len & (key->block_size - 1)) return STATUS_INVALID_BUFFER_SIZE; + if (input_len & (key->u.s.block_size - 1)) return STATUS_INVALID_BUFFER_SIZE; if (!output) return STATUS_SUCCESS; if (flags & BCRYPT_BLOCK_PADDING) { - if (output_len + key->block_size < *ret_len) return STATUS_BUFFER_TOO_SMALL; - if (input_len < key->block_size) return STATUS_BUFFER_TOO_SMALL; - bytes_left -= key->block_size; + if (output_len + key->u.s.block_size < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (input_len < key->u.s.block_size) return STATUS_BUFFER_TOO_SMALL; + bytes_left -= key->u.s.block_size; } else if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; - if (key->mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; + if (key->u.s.mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; src = input; dst = output; - while (bytes_left >= key->block_size) + while (bytes_left >= key->u.s.block_size) { - if ((status = key_decrypt( key, src, key->block_size, dst, key->block_size ))) return status; - if (key->mode == MODE_ID_ECB && (status = key_set_params( key, NULL, 0 ))) return status; - bytes_left -= key->block_size; - src += key->block_size; - dst += key->block_size; + if ((status = key_symmetric_decrypt( key, src, key->u.s.block_size, dst, key->u.s.block_size ))) + return status; + if (key->u.s.mode == MODE_ID_ECB && (status = key_symmetric_set_params( key, NULL, 0 ))) return status; + bytes_left -= key->u.s.block_size; + src += key->u.s.block_size; + dst += key->u.s.block_size; } if (flags & BCRYPT_BLOCK_PADDING) { - if (!(buf = heap_alloc( key->block_size ))) return STATUS_NO_MEMORY; - status = key_decrypt( key, src, key->block_size, buf, key->block_size ); - if (!status && buf[ key->block_size - 1 ] <= key->block_size) + if (!(buf = heap_alloc( key->u.s.block_size ))) return STATUS_NO_MEMORY; + status = key_symmetric_decrypt( key, src, key->u.s.block_size, buf, key->u.s.block_size ); + if (!status && buf[ key->u.s.block_size - 1 ] <= key->u.s.block_size) { - *ret_len -= buf[ key->block_size - 1 ]; + *ret_len -= buf[ key->u.s.block_size - 1 ]; if (output_len < *ret_len) status = STATUS_BUFFER_TOO_SMALL; - else memcpy( dst, buf, key->block_size - buf[ key->block_size - 1 ] ); + else memcpy( dst, buf, key->u.s.block_size - buf[ key->u.s.block_size - 1 ] ); } - else - status = STATUS_UNSUCCESSFUL; /* FIXME: invalid padding */ + else status = STATUS_UNSUCCESSFUL; /* FIXME: invalid padding */ heap_free( buf ); } -- 2.11.0

1 0

[PATCH 5/5] usp10: Use heap_calloc() in computeIsolatingRunsSet().
by Henri Verbeet 26 Mar '18

26 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/bidi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index b0df781c82a..0fb03ef061a 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -998,7 +998,7 @@ static void computeIsolatingRunsSet(unsigned baselevel, WORD *pcls, const WORD * Run *runs; IsolatedRun *current_isolated; - if (!(runs = heap_alloc(uCount * sizeof(*runs)))) + if (!(runs = heap_calloc(uCount, sizeof(*runs)))) return; list_init(set); -- 2.11.0

2 1

[PATCH v3] comctl32/datetime: Change DATETIME_ReturnFieldWidth() to return width.
by Zhiyi Zhang 26 Mar '18

26 Mar '18

Supersede 143784 This avoids a clang warning of uninitialized value usage. Also removes redundant check and not useful trace. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/datetime.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)

2 1

[PATCH 1/2] api-ms-win-core-sidebyside-l1-1-0: Add missing forward.
by Gijs Vermeulen 26 Mar '18

26 Mar '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- .../api-ms-win-core-sidebyside-l1-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec index 0bf78e2911..6a58321021 100644 --- a/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec +++ b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec @@ -5,7 +5,7 @@ @ stdcall FindActCtxSectionGuid(long ptr long ptr ptr) kernel32.FindActCtxSectionGuid @ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) kernel32.FindActCtxSectionStringW @ stdcall GetCurrentActCtx(ptr) kernel32.GetCurrentActCtx -@ stub QueryActCtxSettingsW +@ stdcall QueryActCtxSettingsW(long ptr wstr wstr ptr long ptr) kernel32.QueryActCtxSettingsW @ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) kernel32.QueryActCtxW @ stdcall ReleaseActCtx(ptr) kernel32.ReleaseActCtx @ stdcall ZombifyActCtx(ptr) kernel32.ZombifyActCtx -- 2.13.6

1 1

[PATCH 4/5] ddraw: Handle DDLOCK_WRITEONLY in wined3dmapflags_from_ddrawmapflags().
by Henri Verbeet 26 Mar '18

26 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 65f24dc13fd..b0a028d4a57 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -570,7 +570,7 @@ unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) unsigned int wined3d_flags; wined3d_flags = flags & handled; - if (!(flags & (DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS))) + if (!(flags & (DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS | DDLOCK_WRITEONLY))) wined3d_flags |= WINED3D_MAP_READ; if (!(flags & DDLOCK_READONLY)) wined3d_flags |= WINED3D_MAP_WRITE; @@ -578,7 +578,7 @@ unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) wined3d_flags |= WINED3D_MAP_READ | WINED3D_MAP_WRITE; if (flags & DDLOCK_NODIRTYUPDATE) wined3d_flags |= WINED3D_MAP_NO_DIRTY_UPDATE; - flags &= ~(handled | DDLOCK_WAIT | DDLOCK_READONLY | DDLOCK_NODIRTYUPDATE); + flags &= ~(handled | DDLOCK_WAIT | DDLOCK_READONLY | DDLOCK_WRITEONLY | DDLOCK_NODIRTYUPDATE); if (flags) FIXME("Unhandled flags %#x.\n", flags); -- 2.11.0

1 0

[PATCH 3/5] wined3d: Simplify wined3d_device_update_sub_resource() a little.
by Henri Verbeet 26 Mar '18

26 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 64437a357e6..b66b3946c46 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4248,7 +4248,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str height = 1; depth = 1; } - else if (resource->type == WINED3D_RTYPE_TEXTURE_2D || resource->type == WINED3D_RTYPE_TEXTURE_3D) + else { struct wined3d_texture *texture = texture_from_resource(resource); unsigned int level; @@ -4264,11 +4264,6 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str height = wined3d_texture_get_level_height(texture, level); depth = wined3d_texture_get_level_depth(texture, level); } - else - { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); - return; - } if (!box) { -- 2.11.0

1 0

[PATCH 2/5] wined3d: Handle 3D textures in wined3d_device_copy_sub_resource_region().
by Henri Verbeet 26 Mar '18

26 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 29083ea1c7d..64437a357e6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4158,7 +4158,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev wined3d_box_set(&dst_box, dst_x, 0, dst_x + (src_box->right - src_box->left), 1, 0, 1); } - else if (dst_resource->type == WINED3D_RTYPE_TEXTURE_2D) + else { struct wined3d_texture *dst_texture = texture_from_resource(dst_resource); struct wined3d_texture *src_texture = texture_from_resource(src_resource); @@ -4190,16 +4190,18 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (!src_box) { - unsigned int src_w, src_h, dst_w, dst_h, dst_level; + unsigned int src_w, src_h, src_d, dst_w, dst_h, dst_d, dst_level; src_w = wined3d_texture_get_level_width(src_texture, src_level); src_h = wined3d_texture_get_level_height(src_texture, src_level); + src_d = wined3d_texture_get_level_depth(src_texture, src_level); dst_level = dst_sub_resource_idx % dst_texture->level_count; dst_w = wined3d_texture_get_level_width(dst_texture, dst_level) - dst_x; dst_h = wined3d_texture_get_level_height(dst_texture, dst_level) - dst_y; + dst_d = wined3d_texture_get_level_depth(dst_texture, dst_level) - dst_z; - wined3d_box_set(&b, 0, 0, min(src_w, dst_w), min(src_h, dst_h), 0, 1); + wined3d_box_set(&b, 0, 0, min(src_w, dst_w), min(src_h, dst_h), 0, min(src_d, dst_d)); src_box = &b; } else if (FAILED(wined3d_texture_check_box_dimensions(src_texture, src_level, src_box))) @@ -4209,7 +4211,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev } wined3d_box_set(&dst_box, dst_x, dst_y, dst_x + (src_box->right - src_box->left), - dst_y + (src_box->bottom - src_box->top), 0, 1); + dst_y + (src_box->bottom - src_box->top), dst_z, dst_z + (src_box->back - src_box->front)); if (FAILED(wined3d_texture_check_box_dimensions(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_box))) { @@ -4217,11 +4219,6 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } } - else - { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); - return WINED3DERR_INVALIDCALL; - } wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, dst_sub_resource_idx, &dst_box, src_resource, src_sub_resource_idx, src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Get rid of the special case for WINED3D_RTYPE_TEXTURE_3D in wined3d_device_update_texture().
by Henri Verbeet 26 Mar '18

26 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7f211f23fec..29083ea1c7d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3820,12 +3820,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, level_count = min(src_level_count, dst_level_count); src_size = max(src_texture->resource.width, src_texture->resource.height); + src_size = max(src_size, src_texture->resource.depth); dst_size = max(dst_texture->resource.width, dst_texture->resource.height); - if (type == WINED3D_RTYPE_TEXTURE_3D) - { - src_size = max(src_size, src_texture->resource.depth); - dst_size = max(dst_size, dst_texture->resource.depth); - } + dst_size = max(dst_size, dst_texture->resource.depth); while (src_size > dst_size) { src_size >>= 1; -- 2.11.0

1 0

[PATCH v2] comctl32/datetime: Change DATETIME_ReturnFieldWidth() to return width.
by Zhiyi Zhang 26 Mar '18

26 Mar '18

Supersede 143620 This avoids a clang warning of uninitialized value usage. Also removes redundant argument check and not useful trace. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/datetime.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)

2 1

[PATCH 1/4] wsdapi: Add support for writing XML attributes.
by Owen Rudge 26 Mar '18

26 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-)

2 1

[PATCH] explorer.c: Test for explorer.exe (try 3)
by Carlos Vega García 26 Mar '18

26 Mar '18

Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> Makefile.in: Makefile for explorer.exe tests (try 3) Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> Makefile.in: Makefile for explorer.exe tests (try 3) Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> --- programs/explorer/tests/Makefile.in | 6 ++ programs/explorer/tests/explorer.c | 180 ++++++++++++++++++++++++++++++++++++ 2 files changed, 186 insertions(+) create mode 100755 programs/explorer/tests/Makefile.in create mode 100644 programs/explorer/tests/explorer.c diff --git a/programs/explorer/tests/Makefile.in b/programs/explorer/tests/Makefile.in new file mode 100755 index 0000000..041549a --- /dev/null +++ b/programs/explorer/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = explorer.exe +IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi + +C_SRCS = \ + explorer.c + diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c new file mode 100644 index 0000000..d195486 --- /dev/null +++ b/programs/explorer/tests/explorer.c @@ -0,0 +1,180 @@ +/* + * Unit tests for explorer.exe + * + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "dde.h" +#include "ddeml.h" +#include "shlobj.h" +#include "wine/test.h" +#include "winuser.h" +#include <stdio.h> +#include <winbase.h> + +/* We test the explorer.exe. This will be the base for start making other tests + * for future + * funtionalities for the explorer (drag&drop). + * + * Tests already implemented: + * - BOOL explorer_available() + */ + +static BOOL use_common(void) +{ + HMODULE hmod; + static BOOL(WINAPI * pIsNTAdmin)(DWORD, LPDWORD); + + /* IsNTAdmin() is available on all platforms. */ + hmod = LoadLibraryA("advpack.dll"); + pIsNTAdmin = (void *)GetProcAddress(hmod, "IsNTAdmin"); + + if (!pIsNTAdmin(0, NULL)) + { + /* We are definitely not an administrator */ + FreeLibrary(hmod); + return FALSE; + } + FreeLibrary(hmod); + + return TRUE; +} + +static BOOL full_title(void) +{ + CABINETSTATE cs; + + memset(&cs, 0, sizeof(cs)); + ReadCabinetState(&cs, sizeof(cs)); + + return (cs.fFullPathTitle == -1); +} + +static char ProgramsDir[MAX_PATH]; +static void init_strings(void) +{ + char commonprograms[MAX_PATH]; + char programs[MAX_PATH]; + + SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); + + /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before + * Vista + * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) + * or + * not (CSIDL_PROGRAMS). + */ + + if (use_common()) + lstrcpyA(ProgramsDir, commonprograms); + else + lstrcpyA(ProgramsDir, programs); +} + +static BOOL check_window_exists(const char *name) +{ + char title[MAX_PATH]; + HWND window = NULL; + int i; + + if (full_title()) + { + strcpy(title, ProgramsDir); + strcat(title, "\\"); + strcat(title, name); + } + else + + strcpy(title, name); + trace("\n \n Window name: %s \n \n", name); + + /* In the next lines we want to ceck if te specified windows has created. We + * don't know exactly how long it will + * take to open the window so we use a loop and sleep function to wait until + * the window opens. + */ + for (i = 0; i < 10; i++) + { + Sleep(20 + 20 * i); + if ((window = FindWindowA("ExplorerWClass", title)) + || (window = FindWindowA("CabinetWClass", title))) + { + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; + } + } + + return (window != NULL); +} + +/* +*We make a call to open a new explorer window and we test if it finally opens. +*I test two window name because in some Windows versions when I open the explorer it creates +*the window with another header. +*/ +BOOL explorer_available(void) +{ + STARTUPINFOA si; + PROCESS_INFORMATION pi; + BOOL is_window_created; + + char cmd[] = {'e', 'x', 'p', 'l', 'o', 'r', 'e', 'r', ' ', 'C', + ':', 92, 'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + char window_name[] = {'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + char window_name_alternative[] = {'C',':',92,'W', 'I', 'N', 'D', 'O', 'W', 'S', 0}; + /*I use the character 92 = '\' because if you write the character the gcc + * compiler misunderstand it*/ + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + is_window_created = check_window_exists(window_name); + + /*Checks if the window has been created*/ + if (is_window_created) + { + return TRUE; + } + + /*If the first window has not been detected it checks with the alterntive name*/ + if (!is_window_created) + { + if(check_window_exists(window_name_alternative)){ + return TRUE; + } + } + return FALSE; +} + +START_TEST(explorer) +{ + BOOL is_explorer_available; + + /*First we initialize and get th Programs Directoy*/ + init_strings(); + + /*We get if the explorer is avaible and correctcly opens, the we save it into a varible*/ + is_explorer_available = explorer_available(); + + ok(is_explorer_available == TRUE, "No explorer window has opened \n"); + if (!is_explorer_available) + { + win_skip("Explorer.exe is not available \n"); + } +} -- 2.7.4

3 2

[PATCH] testbot/web: Tweak ItemPage to save the Item directly.
by Francois Gouget 26 Mar '18

26 Mar '18

This avoids depending on whether Items retrieved with Collection::GetItem() are stored in the Collection or not. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 4086a9385..b44e5b2d3 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -137,6 +137,16 @@ sub SaveProperty($$$) return 1; } +sub Save($) +{ + my ($self) = @_; + + return !1 if (!$self->SaveProperties()); + + ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); + return ! defined($self->{ErrMessage}); +} + sub OnAction($$) { my ($self, $Action) = @_; -- 2.16.2

1 0

[PATCH] testbot: Always allow direct access to the table rows.
by Francois Gouget 26 Mar '18

26 Mar '18

So far it was always necessary to go through the hierarchies like Job -> Step -> Task. Now it is possible to directly retrieve all the rows in any table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm | 17 ++++++++++++++++- testbot/lib/ObjectModel/Item.pm | 4 +--- testbot/lib/ObjectModel/PropertyDescriptor.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/PendingPatchSets.pm | 1 + testbot/lib/WineTestBot/PendingPatches.pm | 16 ++++++++++++++-- testbot/lib/WineTestBot/RecordGroups.pm | 1 + testbot/lib/WineTestBot/Steps.pm | 16 +++++++++++----- testbot/lib/WineTestBot/Tasks.pm | 14 ++++++++++++-- testbot/lib/WineTestBot/UserRoles.pm | 13 +++++++++++-- testbot/lib/WineTestBot/Users.pm | 1 + 11 files changed, 70 insertions(+), 15 deletions(-) diff --git a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm index dbef8ac21..d60fe6395 100644 --- a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm @@ -29,7 +29,7 @@ use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateDetailrefPropertyDescriptor); +@EXPORT = qw(&CreateDetailrefPropertyDescriptor &SetDetailrefKeyPrefix); sub _initialize($$) { @@ -66,4 +66,19 @@ sub CreateDetailrefPropertyDescriptor($$$$$) return ObjectModel::DetailrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator); } +sub SetDetailrefKeyPrefix($@) +{ + my $KeyPrefix = shift; + foreach my $PropertyDescriptor (@_) + { + if ($PropertyDescriptor->{IsKey}) + { + # Defines the prefix to prepend to the field name when the key is + # inherited by a child object through a DetailrefPropertyDescriptor + # relation. + $PropertyDescriptor->{KeyPrefix} = $KeyPrefix; + } + } +} + 1; diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 424826f23..201577c98 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -305,8 +305,6 @@ sub GetMasterKey($) { my ($self) = @_; - my $ColNamePrefix = ref($self); - $ColNamePrefix =~ s/.*://; my @MasterColNames, my @MasterColValues; if (defined($self->{MasterColNames})) { @@ -319,7 +317,7 @@ sub GetMasterKey($) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - push @MasterColNames, $ColNamePrefix . $ColName; + push @MasterColNames, $PropertyDescriptor->{KeyPrefix} . $ColName; push @MasterColValues, $self->GetColValue($ColName); } } diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index 9c13b1ca2..583082e81 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -50,6 +50,7 @@ sub new($$$$$@) IsKey => $IsKey, IsRequired => $IsRequired, Class => undef}; + $self->{KeyPrefix} = "" if ($IsKey); $self = bless $self, $class; $self->_initialize(@_); return $self; diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index bcbcae91f..f810b4f12 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -431,6 +431,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, \&CreateSteps), ); +SetDetailrefKeyPrefix("Job", @PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 520fb653c..d51652221 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -180,6 +180,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("TotalParts", "Expected number of parts in series", 1, 1, "N", 2), CreateDetailrefPropertyDescriptor("Parts", "Parts received so far", !1, !1, \&CreatePendingPatches), ); +SetDetailrefKeyPrefix("PendingPatchSet", @PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index 053f7123d..281db60ef 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -69,13 +69,24 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("No", "Part no", 1, 1, "N", 2), CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", !1, 1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), ); +my @FlatPropertyDescriptors = ( + CreateBasicPropertyDescriptor("PendingPatchSetEMail", "EMail of series author", 1, 1, "A", 40), + CreateBasicPropertyDescriptor("PendingPatchSetTotalParts", "Expected number of parts in series", 1, 1, "N", 2), + @PropertyDescriptors +); =pod =over 12 =item C<CreatePendingPatches()> -Creates a collection of PendingPatch objects. +When given a PendingPatchSet object returns a collection containing the +corresponding parts. In this case the PendingPatch objects don't store the +key of their parent. + +If no PendingPatchSet object is specified all the table rows are returned and +the PendingPatch objects have PendingPatchSetEMail and +PendingPatchSetTotalParts properties. =back =cut @@ -86,7 +97,8 @@ sub CreatePendingPatches(;$$) return WineTestBot::PendingPatches->new( "PendingPatches", "PendingPatches", "PendingPatch", - \@PropertyDescriptors, $ScopeObject, $PendingPatchSet); + $PendingPatchSet ? \@PropertyDescriptors : \@FlatPropertyDescriptors, + $ScopeObject, $PendingPatchSet); } 1; diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index 252545569..1e5dbbdd4 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -80,6 +80,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Timestamp", "Timestamp", !1, 1, "DT", 19), CreateDetailrefPropertyDescriptor("Records", "Records", !1, !1, \&CreateRecords), ); +SetDetailrefKeyPrefix("RecordGroup", @PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index f91b70e3f..ef2b3872b 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -216,17 +216,22 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), ); +SetDetailrefKeyPrefix("Step", @PropertyDescriptors); +my @FlatPropertyDescriptors = ( + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 5), + @PropertyDescriptors +); =pod =over 12 =item C<CreateSteps()> -Creates a collection containing the steps of the specified Job. In -this case the Step objects don't store the key of their parent. +When given a Job object returns a collection containing the corresponding +steps. In this case the Step objects don't store the key of their parent. -If no Job is specified all the table rows are returned and the -Step objects have a JobId property. +If no Job object is specified all the table rows are returned and the Step +objects have a JobId property. =back =cut @@ -236,7 +241,8 @@ sub CreateSteps(;$$) my ($ScopeObject, $Job) = @_; return WineTestBot::Steps->new("Steps", "Steps", "Step", - \@PropertyDescriptors, $ScopeObject, $Job); + $Job ? \@PropertyDescriptors : \@FlatPropertyDescriptors, + $ScopeObject, $Job); } 1; diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index dcc222b52..f16dfe201 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -233,13 +233,22 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), ); +my @FlatPropertyDescriptors = ( + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 5), + CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), + @PropertyDescriptors +); =pod =over 12 =item C<CreateTasks()> -Creates a collection of Patch objects. +When given a Step object returns a collection containing the corresponding +tasks. In this case the Task objects don't store the key of their parent. + +If no Step object is specified all the table rows are returned and the Task +objects have JobId and StepNo properties. =back =cut @@ -248,7 +257,8 @@ sub CreateTasks(;$$) { my ($ScopeObject, $Step) = @_; return WineTestBot::Tasks->new("Tasks", "Tasks", "Task", - \@PropertyDescriptors, $ScopeObject, $Step); + $Step ? \@PropertyDescriptors : \@FlatPropertyDescriptors, + $ScopeObject, $Step); } 1; diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 417baf994..972bdc0e9 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -62,13 +62,21 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("Role", "Role", 1, 1, \&CreateRoles, ["RoleName"]), ); +my @FlatPropertyDescriptors = ( + CreateBasicPropertyDescriptor("UserName", "Username", 1, 1, "A", 40), + @PropertyDescriptors +); =pod =over 12 =item C<CreateUserRoles()> -Creates a collection of UserRole objects. +When given a User object returns a collection containing the corresponding +roles. In this case the Role objects don't store the key of their parent. + +If no User object is specified all the table rows are returned and the UserRole +objects have a UserName property. =back =cut @@ -77,7 +85,8 @@ sub CreateUserRoles(;$$) { my ($ScopeObject, $User) = @_; return WineTestBot::UserRoles->new("UserRoles", "UserRoles", "UserRole", - \@PropertyDescriptors, $ScopeObject, $User); + $User ? \@PropertyDescriptors : \@FlatPropertyDescriptors, + $ScopeObject, $User); } 1; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 95c7c2561..178b377b9 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -326,6 +326,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("ResetCode", "Password reset code", !1, !1, "A", 32), CreateDetailrefPropertyDescriptor("Roles", "Roles", !1, !1, \&CreateUserRoles), ); +SetDetailrefKeyPrefix("User", @PropertyDescriptors); =pod =over 12 -- 2.16.2

1 0

[PATCH] testbot/testagentd: Show a message when testagentd is restarted.
by Francois Gouget 26 Mar '18

26 Mar '18

It can be useful to set up a VM to auto-login on Windows and have TestAgentd start automatically on boot. However in such a configuration it can be hard to detect when a test causes Windows to reboot: the client reconnects automatically just like after a network glitch and the VM desktop looks normal. So with this patch TestAgentd can keep track of its restarts, lets the client query that value, and brings up a dialog if an unexpected restart occurs. The start count can also be overriden to deal with cases where some automated process causes a Windows reboot as part of the VM set up process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 20 +++++ testbot/scripts/TestAgent | 15 +++- testbot/src/testagentd/platform.h | 8 ++ testbot/src/testagentd/platform_unix.c | 9 ++ testbot/src/testagentd/platform_windows.c | 31 +++++++ testbot/src/testagentd/testagentd.c | 131 +++++++++++++++++++++++++++++- 6 files changed, 210 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 255c1a19b..2f7ec4def 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -42,6 +42,7 @@ my $RPC_GETPROPERTIES = 8; my $RPC_UPGRADE = 9; my $RPC_RMCHILDPROC = 10; my $RPC_GETCWD = 11; +my $RPC_SETPROPERTY = 12; my %RpcNames=( $RPC_PING => 'ping', @@ -56,6 +57,7 @@ my %RpcNames=( $RPC_UPGRADE => 'upgrade', $RPC_RMCHILDPROC => 'rmchildproc', $RPC_GETCWD => 'getcwd', + $RPC_SETPROPERTY => 'setproperty', ); my $Debug = 0; @@ -1386,6 +1388,24 @@ sub GetProperties($;$) return $Properties; } +sub SetProperty($$$) +{ + my ($self, $PropName, $PropValue) = @_; + debug("SetProperty\n"); + + # Send the command + if (!$self->_StartRPC($RPC_SETPROPERTY) or + !$self->_SendListSize('ArgC', 2) or + !$self->_SendString('PropName', $PropName) or + !$self->_SendString('PropValue', $PropValue)) + { + return undef; + } + + # Get the reply + return $self->_RecvList(''); +} + sub Upgrade($$) { my ($self, $Filename) = @_; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index c41055616..25fc0d426 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -52,7 +52,7 @@ sub error(@) print STDERR "$name0:error: ", @_; } -my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, $PropName, @Rm); +my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, $PropName, $PropValue, @Rm); my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; @@ -229,6 +229,12 @@ while (@ARGV) set_cmd($arg); $PropName = @ARGV ? check_opt_val($arg, $PropName) : '*'; } + elsif ($arg eq "setproperty") + { + set_cmd($arg); + $PropName = check_opt_val($arg, $PropName); + $PropValue = check_opt_val($arg, $PropValue); + } elsif ($arg eq "upgrade") { set_cmd($arg); @@ -319,6 +325,8 @@ if (defined $Usage) print "or $name0 [options] <hostname> wait <pid>\n"; print "or $name0 [options] <hostname> settime\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; + print "or $name0 [options] <hostname> getproperty <name>\n"; + print "or $name0 [options] <hostname> setproperty <name> <value>\n"; print "or $name0 [options] <hostname> [getcwd|ping|version]\n"; print "\n"; print "This is a testagentd client. It can be used to send/receive files and to run commands on the server.\n"; @@ -346,6 +354,7 @@ if (defined $Usage) print " getproperty <name> Retrieves and prints the specified server property, for\n"; print " instance its architecture, 'server.arch'. One can print all the\n"; print " properties at once by omitting the name or setting it to '*'.\n"; + print " setproperty <name> <value> Sets the specified property.\n"; print " getcwd Returns the server's current working directory.\n"; print " ping Makes sure the server is still alive.\n"; print " upgrade Replaces the server executable with the specified file and\n"; @@ -480,6 +489,10 @@ elsif ($Cmd eq "getversion") $Result = $TA->GetVersion(); print "Version=$Result\n" if (defined $Result); } +elsif ($Cmd eq "setproperty") +{ + $Result = $TA->SetProperty($PropName, $PropValue); +} elsif ($Cmd eq "ping") { $Result = $TA->Ping(); diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index 84ab4917c..98dfe394c 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -103,6 +103,14 @@ int platform_settime(uint64_t epoch, uint32_t leeway); */ int platform_upgrade_script(const char* script, const char* tmpserver, char** argv); +/* Called when the message has been dismissed by the user. + */ +typedef void (*message_dismissed_func)(void); + +/* Shows the specified message. + */ +void platform_show_message(const char* message, message_dismissed_func func); + /* Returns a string describing the last socket-related error */ int sockeintr(void); const char* sockerror(void); diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index dcd4d69b6..fbaa995b0 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -270,6 +270,15 @@ int platform_upgrade_script(const char* script, const char* tmpserver, char** ar return 1; } +void platform_show_message(const char* message, message_dismissed_func dismissed) +{ + /* Don't bother trying to pop up a GUI. There may not be one anyway. + * Since the user has no way to dismiss the dialog the dismissed function + * is not called. + */ + fprintf(stderr, "%s", message); +} + int sockeintr(void) { return errno == EINTR; diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 1efac1c77..5c55b2004 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -312,6 +312,37 @@ int platform_upgrade_script(const char* script, const char* tmpserver, char** ar return 1; } +struct msg_thread_t +{ + char* message; + message_dismissed_func dismissed; +}; + +DWORD WINAPI msg_thread(LPVOID parameter) +{ + struct msg_thread_t* data = parameter; + + MessageBoxA(NULL, data->message, "Message", MB_OK); + free(data->message); + if (data->dismissed) + (*data->dismissed)(); + free(data); + return 0; +} + +void platform_show_message(const char* message, message_dismissed_func dismissed) +{ + HANDLE thread; + struct msg_thread_t* data = malloc(sizeof(struct msg_thread_t)); + + fprintf(stderr, message); + + data->message = strdup(message); + data->dismissed = dismissed; + thread = CreateThread(NULL, 0, &msg_thread, data, 0, NULL); + CloseHandle(thread); +} + int sockretry(void) { return (WSAGetLastError() == WSAEINTR); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 5f0f54ca2..79016c067 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -37,9 +37,10 @@ * 1.3: Fix the zero / infinite timeouts in the wait2 RPC. * 1.4: Add the settime RPC. * 1.5: Add support for upgrading the server. - * 1.6: Add support for the rmchildproc and getcwd RPC. + * 1.6: Add the rmchildproc and getcwd RPCs. + * 1.7: Add --show-restarts and the setproperty RPC. */ -#define PROTOCOL_VERSION "testagentd 1.6" +#define PROTOCOL_VERSION "testagentd 1.7" #define BLOCK_SIZE 65536 @@ -91,6 +92,7 @@ enum rpc_ids_t RPCID_UPGRADE, RPCID_RMCHILDPROC, RPCID_GETCWD, + RPCID_SETPROPERTY, }; /* This is the RPC currently being processed */ @@ -113,6 +115,7 @@ static const char* rpc_name(uint32_t id) "upgrade", "rmchildproc", "getcwd", + "setproperty", }; if (id < sizeof(names) / sizeof(*names)) @@ -619,6 +622,47 @@ static int send_file(SOCKET client, int fd, const char* filename) } +/* + * TestAgentd restart / Windows reboot tracking. + */ + +static unsigned int start_count = 0; + +static char* start_count_filename(void) +{ + char* filename = malloc(strlen(name0) + 5 + 1); + sprintf(filename, "%s.data", name0); + return filename; +} + +static void load_start_count(void) +{ + FILE *fh; + char* filename = start_count_filename(); + fh = fopen(filename, "r"); + if (fh) + { + if (!fscanf(fh, "%d", &start_count)) + start_count = 0; + fclose(fh); + } + free(filename); +} + +static void save_start_count(void) +{ + FILE *fh; + char* filename = start_count_filename(); + fh = fopen(filename, "w"); + if (fh) + { + fprintf(fh, "%d\n", start_count); + fclose(fh); + } + free(filename); +} + + /* * High-level operations. */ @@ -969,7 +1013,7 @@ static void do_getproperties(SOCKET client) send_error(client); return; } - send_list_size(client, 2); + send_list_size(client, 3); format_msg(&buf, &size, "protocol.version=%s", PROTOCOL_VERSION); send_string(client, buf); @@ -984,9 +1028,53 @@ static void do_getproperties(SOCKET client) #endif format_msg(&buf, &size, "server.arch=%s", arch); send_string(client, buf); + + format_msg(&buf, &size, "start.count=%u", start_count); + send_string(client, buf); + free(buf); } +static void do_setproperty(SOCKET client) +{ + char *name = NULL, *value = NULL; + + if (!expect_list_size(client, 2) || + !recv_string(client, &name) || + !recv_string(client, &value)) + { + send_error(client); + return; + } + + if (strcmp(name, "start.count") == 0) + { + unsigned int val; + if (sscanf(value, "%u", &val) == 1) + { + start_count = val; + save_start_count(); + send_list_size(client, 0); + } + else + { + set_status(ST_ERROR, "'%s' is not a valid %s value", value, name); + send_error(client); + } + } + else if (strcmp(name, "protocol.version") == 0 || + strcmp(name, "server.arch") == 0) + { + set_status(ST_ERROR, "%s is read-only", name); + send_error(client); + } + else + { + set_status(ST_ERROR, "unknown property %s", name); + send_error(client); + } +} + static void do_upgrade(SOCKET client) { static const char *filename = "testagentd.tmp"; @@ -1033,6 +1121,10 @@ static void do_upgrade(SOCKET client) free(args[0]); if (success) { + /* Decrement the start count since this one is intentional */ + start_count--; + save_start_count(); + broken = 1; quit = 1; } @@ -1129,6 +1221,9 @@ static void process_rpc(SOCKET client) case RPCID_RMCHILDPROC: do_rmchildproc(client); break; + case RPCID_SETPROPERTY: + do_setproperty(client); + break; default: do_unknown(client, rpcid); } @@ -1214,11 +1309,33 @@ static int is_host_allowed(SOCKET client, const char* srchost, int addrlen) return 0; } + +static void reset_start_count(void) +{ + start_count = 1; + save_start_count(); +} + +static void check_start_count(void) +{ + load_start_count(); + start_count++; + save_start_count(); + + if (start_count > 1) + { + char msg[255]; + sprintf(msg, "%s was restarted (%d). Did Windows reboot?\n", name0, start_count); + platform_show_message(msg, &reset_start_count); + } +} + int main(int argc, char** argv) { const char* p; char** arg; int opt_detach = 0; + int opt_show_restarts = 0; char* opt_port = NULL; char* opt_srchost = NULL; struct addrinfo *addresses, *addrp; @@ -1247,6 +1364,10 @@ int main(int argc, char** argv) { opt_detach = 1; } + else if (strcmp(*arg, "--show-restarts") == 0) + { + opt_show_restarts = 1; + } else if (strcmp(*arg, "--help") == 0) { opt_usage = 1; @@ -1328,11 +1449,15 @@ int main(int argc, char** argv) printf(" --debug Prints detailed information about what happens.\n"); printf(" --detach Detach from the console / terminal. Note that on Windows you should\n"); printf(" combine this with start: start %s --detach ...\n", name0); + printf(" --show-restarts Shows a message if %s has been restarted (for instance\n", name0); + printf(" because of a Windows reboot).\n"); printf(" --help Shows this usage message.\n"); exit(0); } if (opt_detach) platform_detach_console(); + if (opt_show_restarts) + check_start_count(); /* Bind to the host in a protocol neutral way */ #ifdef SOCK_CLOEXEC -- 2.16.2

1 0

[PATCH 6/6] bcrypt: Store full ECCKEY_BLOB struct in BCryptImportKeyPair.
by Alistair Leslie-Hughes 26 Mar '18

26 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2dd588a..82bece5 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1401,6 +1401,7 @@ static void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnutls_key ) { + BCRYPT_ECCKEY_BLOB *ecc_blob; gnutls_ecc_curve_t curve; gnutls_datum_t x, y; int ret; @@ -1421,10 +1422,11 @@ static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnut return STATUS_INTERNAL_ERROR; } - x.data = key->u.a.pubkey; - x.size = key->u.a.pubkey_len / 2; - y.data = key->u.a.pubkey + x.size; - y.size = x.size; + ecc_blob = (BCRYPT_ECCKEY_BLOB *)key->u.a.pubkey; + x.data = key->u.a.pubkey + sizeof(*ecc_blob); + x.size = ecc_blob->cbKey; + y.data = key->u.a.pubkey + sizeof(*ecc_blob) + ecc_blob->cbKey; + y.size = ecc_blob->cbKey; if ((ret = pgnutls_pubkey_import_ecc_raw( *gnutls_key, curve, &x, &y ))) { @@ -2058,7 +2060,7 @@ NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HAN return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; - if ((status = key_asymmetric_init( key, alg, (BYTE *)(ecc_blob + 1), ecc_blob->cbKey * 2 ))) + if ((status = key_asymmetric_init( key, alg, (BYTE *)ecc_blob, sizeof(*ecc_blob) + ecc_blob->cbKey * 2 ))) { heap_free( key ); return status; -- 1.9.1

1 0

[PATCH 5/6] bcrypt/tests: Add simple test for RSA.
by Alistair Leslie-Hughes 26 Mar '18

26 Mar '18

From: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Based on patch from Bernhard Übelacker. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/tests/bcrypt.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 57d0488..7d59f6d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1495,6 +1495,100 @@ static void test_ECDSA(void) pBCryptCloseAlgorithmProvider(alg, 0); } +static UCHAR rsaPublicBlob[] = +{ + 0x52, 0x53, 0x41, 0x31, 0x00, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0xad, 0x41, 0x09, 0xa2, 0x56, + 0x3a, 0x7b, 0x75, 0x4b, 0x72, 0x9b, 0x28, 0x72, 0x3b, 0xae, 0x9f, 0xd8, 0xa8, 0x25, 0x4a, 0x4c, + 0x19, 0xf5, 0xa6, 0xd0, 0x05, 0x1c, 0x59, 0x8f, 0xe3, 0xf3, 0x2d, 0x29, 0x47, 0xf8, 0x80, 0x25, + 0x25, 0x21, 0x58, 0xc2, 0xac, 0xa1, 0x9e, 0x93, 0x8e, 0x82, 0x6d, 0xd7, 0xf3, 0xe7, 0x8f, 0x0b, + 0xc0, 0x41, 0x85, 0x29, 0x3c, 0xf1, 0x0b, 0x2c, 0x5d, 0x49, 0xed, 0xb4, 0x30, 0x6e, 0x02, 0x15, + 0x4b, 0x9a, 0x08, 0x0d, 0xe1, 0x6f, 0xa8, 0xd3, 0x12, 0xab, 0x66, 0x48, 0x4d, 0xd9, 0x28, 0x03, + 0x6c, 0x9d, 0x44, 0x7a, 0xed, 0xc9, 0x43, 0x4f, 0x9d, 0x4e, 0x3c, 0x7d, 0x0e, 0xff, 0x07, 0x87, + 0xeb, 0xca, 0xca, 0x65, 0x6d, 0xbe, 0xc5, 0x31, 0x8b, 0xcc, 0x7e, 0x0a, 0x71, 0x4a, 0x4d, 0x9d, + 0x3d, 0xfd, 0x7a, 0x56, 0x32, 0x8a, 0x6c, 0x6d, 0x9d, 0x2a, 0xd9, 0x8e, 0x68, 0x89, 0x63, 0xc6, + 0x4f, 0x24, 0xd1, 0x2a, 0x72, 0x69, 0x08, 0x77, 0xa0, 0x7f, 0xfe, 0xc6, 0x33, 0x8d, 0xb4, 0x7d, + 0x73, 0x91, 0x13, 0x9c, 0x47, 0x53, 0x6a, 0x13, 0xdf, 0x19, 0xc7, 0xed, 0x48, 0x81, 0xed, 0xd8, + 0x1f, 0x11, 0x11, 0xbb, 0x41, 0x15, 0x5b, 0xa4, 0xf5, 0xc9, 0x2b, 0x48, 0x5e, 0xd8, 0x4b, 0x52, + 0x1f, 0xf7, 0x87, 0xf2, 0x68, 0x25, 0x28, 0x79, 0xee, 0x39, 0x41, 0xc9, 0x0e, 0xc8, 0xf9, 0xf2, + 0xd8, 0x24, 0x09, 0xb4, 0xd4, 0xb7, 0x90, 0xba, 0x26, 0xe8, 0x1d, 0xb4, 0xd7, 0x09, 0x00, 0xc4, + 0xa0, 0xb6, 0x14, 0xe8, 0x4c, 0x29, 0x60, 0x54, 0x2e, 0x01, 0xde, 0x54, 0x66, 0x40, 0x22, 0x50, + 0x27, 0xf1, 0xe7, 0x62, 0xa9, 0x00, 0x5a, 0x61, 0x2e, 0xfa, 0xfe, 0x16, 0xd8, 0xe0, 0xe7, 0x66, + 0x17, 0xda, 0xb8, 0x0c, 0xa6, 0x04, 0x8d, 0xf8, 0x21, 0x68, 0x39 +}; + +static UCHAR rsaHash[] = +{ + 0x96, 0x1f, 0xa6, 0x49, 0x58, 0x81, 0x8f, 0x76, 0x77, 0x07, 0x07, 0x27, 0x55, 0xd7, 0x01, 0x8d, + 0xcd, 0x27, 0x8e, 0x94 +}; + +static UCHAR rsaSignature[] = +{ + 0xa8, 0x3a, 0x9d, 0xaf, 0x92, 0x94, 0xa4, 0x4d, 0x34, 0xba, 0x41, 0x0c, 0xc1, 0x23, 0x91, 0xc7, + 0x91, 0xa8, 0xf8, 0xfc, 0x94, 0x87, 0x4d, 0x05, 0x85, 0x63, 0xe8, 0x7d, 0xea, 0x7f, 0x6b, 0x8d, + 0xbb, 0x9a, 0xd4, 0x46, 0xa6, 0xc0, 0xd6, 0xdc, 0x91, 0xba, 0xd3, 0x1a, 0xbf, 0xf4, 0x52, 0xa0, + 0xc7, 0x15, 0x87, 0xe9, 0x1e, 0x60, 0x49, 0x9c, 0xee, 0x5a, 0x9c, 0x6c, 0xbd, 0x7a, 0x3e, 0xc3, + 0x48, 0xb3, 0xee, 0xca, 0x68, 0x40, 0x9b, 0xa1, 0x4c, 0x6e, 0x20, 0xd6, 0xca, 0x6c, 0x72, 0xaf, + 0x2b, 0x6b, 0x62, 0x7c, 0x78, 0x06, 0x94, 0x4c, 0x02, 0xf3, 0x8d, 0x49, 0xe0, 0x11, 0xc4, 0x9b, + 0x62, 0x5b, 0xc2, 0xfd, 0x68, 0xf4, 0x07, 0x15, 0x71, 0x11, 0x4c, 0x35, 0x97, 0x5d, 0xc0, 0xe6, + 0x22, 0xc9, 0x8a, 0x7b, 0x96, 0xc9, 0xc3, 0xe4, 0x2b, 0x1e, 0x88, 0x17, 0x4f, 0x98, 0x9b, 0xf3, + 0x42, 0x23, 0x0c, 0xa0, 0xfa, 0x19, 0x03, 0x2a, 0xf7, 0x13, 0x2d, 0x27, 0xac, 0x9f, 0xaf, 0x2d, + 0xa3, 0xce, 0xf7, 0x63, 0xbb, 0x39, 0x9f, 0x72, 0x80, 0xdd, 0x6c, 0x73, 0x00, 0x85, 0x70, 0xf2, + 0xed, 0x50, 0xed, 0xa0, 0x74, 0x42, 0xd7, 0x22, 0x46, 0x24, 0xee, 0x67, 0xdf, 0xb5, 0x45, 0xe8, + 0x49, 0xf4, 0x9c, 0xe4, 0x00, 0x83, 0xf2, 0x27, 0x8e, 0xa2, 0xb1, 0xc3, 0xc2, 0x01, 0xd7, 0x59, + 0x2e, 0x4d, 0xac, 0x49, 0xa2, 0xc1, 0x8d, 0x88, 0x4b, 0xfe, 0x28, 0xe5, 0xac, 0xa6, 0x85, 0xc4, + 0x1f, 0xf8, 0xc5, 0xc5, 0x14, 0x4e, 0xa3, 0xcb, 0x17, 0xb7, 0x64, 0xb3, 0xc2, 0x12, 0xf8, 0xf8, + 0x36, 0x99, 0x1c, 0x91, 0x9b, 0xbd, 0xed, 0x55, 0x0f, 0xfd, 0x49, 0x85, 0xbb, 0x32, 0xad, 0x78, + 0xc1, 0x74, 0xe6, 0x7c, 0x18, 0x0f, 0x2b, 0x3b, 0xaa, 0xd1, 0x9d, 0x40, 0x71, 0x1d, 0x19, 0x53 +}; + +static void test_RSA(void) +{ + BCRYPT_PKCS1_PADDING_INFO pad; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_KEY_HANDLE key = NULL; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (ret) + { + win_skip("Failed to open RSA provider: %08x, skipping test\n", ret); + return; + } + + ret = pBCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(!ret, "pBCryptImportKeyPair failed: %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(!ret, "pBCryptVerifySignature failed: %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_AES_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_NOT_SUPPORTED, "Expected STATUS_NOT_SUPPORTED, got %08x\n", ret); + + pad.pszAlgId = NULL; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(!ret, "pBCryptDestroyKey failed: %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "pBCryptCloseAlgorithmProvider failed: %08x\n", ret); +} + START_TEST(bcrypt) { HMODULE module; @@ -1538,6 +1632,7 @@ START_TEST(bcrypt) test_BCryptDecrypt(); test_key_import_export(); test_ECDSA(); + test_RSA(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); -- 1.9.1

1 0

[PATCH 4/6] bcrypt: Initial implementation for RSA key import and signature verification.
by Alistair Leslie-Hughes 26 Mar '18

26 Mar '18

From: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 128 ++++++++++++++++++++++++++++++++++++++++++---- include/bcrypt.h | 17 ++++++ 2 files changed, 135 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ee6c211..2dd588a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -77,6 +77,9 @@ static int (*pgnutls_pubkey_verify_hash2)(gnutls_pubkey_t key, gnutls_sign_algor unsigned int flags, const gnutls_datum_t *hash, const gnutls_datum_t *signature); +/* Not present in gnutls version < 2.11.0 */ +static int (*pgnutls_pubkey_import_rsa_raw)(gnutls_pubkey_t key, const gnutls_datum_t *m, const gnutls_datum_t *e); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_cipher_decrypt2); @@ -120,6 +123,11 @@ static int compat_gnutls_pubkey_verify_hash2(gnutls_pubkey_t key, gnutls_sign_al return GNUTLS_E_UNKNOWN_CIPHER_TYPE; } +static int compat_gnutls_pubkey_import_rsa_raw(gnutls_pubkey_t key, const gnutls_datum_t *m, const gnutls_datum_t *e) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -186,6 +194,11 @@ static BOOL gnutls_initialize(void) WARN("gnutls_pubkey_verify_hash2 not found\n"); pgnutls_pubkey_verify_hash2 = compat_gnutls_pubkey_verify_hash2; } + if (!(pgnutls_pubkey_import_rsa_raw = wine_dlsym( libgnutls_handle, "gnutls_pubkey_import_rsa_raw", NULL, 0 ))) + { + WARN("gnutls_pubkey_import_rsa_raw not found\n"); + pgnutls_pubkey_import_rsa_raw = compat_gnutls_pubkey_import_rsa_raw; + } if (TRACE_ON( bcrypt )) { @@ -271,6 +284,7 @@ enum alg_id ALG_ID_MD4, ALG_ID_MD5, ALG_ID_RNG, + ALG_ID_RSA, ALG_ID_SHA1, ALG_ID_SHA256, ALG_ID_SHA384, @@ -301,6 +315,7 @@ static const struct { /* ALG_ID_MD4 */ { 270, 16, 512, BCRYPT_MD4_ALGORITHM, FALSE }, /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM, FALSE }, /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM, FALSE }, + /* ALG_ID_RSA */ { 0, 0, 0, BCRYPT_RSA_ALGORITHM, FALSE }, /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM, FALSE }, /* ALG_ID_SHA256 */ { 286, 32, 512, BCRYPT_SHA256_ALGORITHM, FALSE }, /* ALG_ID_SHA384 */ { 382, 48, 1024, BCRYPT_SHA384_ALGORITHM, FALSE }, @@ -378,6 +393,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR else if (!strcmpW( id, BCRYPT_MD4_ALGORITHM )) alg_id = ALG_ID_MD4; else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; else if (!strcmpW( id, BCRYPT_RNG_ALGORITHM )) alg_id = ALG_ID_RNG; + else if (!strcmpW( id, BCRYPT_RSA_ALGORITHM )) alg_id = ALG_ID_RSA; else if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256; else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; @@ -1080,6 +1096,7 @@ static NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, con { case ALG_ID_ECDSA_P256: case ALG_ID_ECDSA_P384: + case ALG_ID_RSA: break; default: @@ -1419,6 +1436,34 @@ static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnut return STATUS_SUCCESS; } +static NTSTATUS import_gnutls_pubkey_rsa( struct key *key, gnutls_pubkey_t *gnutls_key ) +{ + BCRYPT_RSAKEY_BLOB *rsa_blob; + gnutls_datum_t m, e; + int ret; + + if ((ret = pgnutls_pubkey_init( gnutls_key ))) + { + 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); + e.size = rsa_blob->cbPublicExp; + m.data = key->u.a.pubkey + sizeof(*rsa_blob) + rsa_blob->cbPublicExp; + m.size = rsa_blob->cbModulus; + + if ((ret = pgnutls_pubkey_import_rsa_raw( *gnutls_key, &m, &e ))) + { + pgnutls_perror( ret ); + pgnutls_pubkey_deinit( *gnutls_key ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_key) { switch (key->alg_id) @@ -1426,6 +1471,8 @@ static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_ case ALG_ID_ECDSA_P256: case ALG_ID_ECDSA_P384: return import_gnutls_pubkey_ecc( key, gnutls_key ); + case ALG_ID_RSA: + return import_gnutls_pubkey_rsa( key, gnutls_key ); default: FIXME("Algorithm %d not yet supported\n", key->alg_id); @@ -1455,6 +1502,14 @@ static NTSTATUS prepare_gnutls_signature_ecc( struct key *key, UCHAR *signature, return STATUS_SUCCESS; } +static NTSTATUS prepare_gnutls_signature_rsa( struct key *key, UCHAR *signature, ULONG signature_len, + gnutls_datum_t *gnutls_signature ) +{ + gnutls_signature->data = signature; + gnutls_signature->size = signature_len; + return STATUS_SUCCESS; +} + static NTSTATUS prepare_gnutls_signature( struct key *key, UCHAR *signature, ULONG signature_len, gnutls_datum_t *gnutls_signature ) { @@ -1463,6 +1518,8 @@ static NTSTATUS prepare_gnutls_signature( struct key *key, UCHAR *signature, ULO case ALG_ID_ECDSA_P256: case ALG_ID_ECDSA_P384: return prepare_gnutls_signature_ecc( key, signature, signature_len, gnutls_signature ); + case ALG_ID_RSA: + return prepare_gnutls_signature_rsa( key, signature, signature_len, gnutls_signature ); default: FIXME( "Algorithm %d not yet supported\n", key->alg_id ); @@ -1481,18 +1538,38 @@ static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *ha NTSTATUS status; int ret; - if (flags) - FIXME( "Flags %08x not supported\n", flags ); + if (key->alg_id == ALG_ID_RSA) + { + BCRYPT_PKCS1_PADDING_INFO *pinfo = (BCRYPT_PKCS1_PADDING_INFO *)padding; - /* only the hash size must match, not the actual hash function */ - switch (hash_len) + if (!(flags & BCRYPT_PAD_PKCS1) || !pinfo) return STATUS_INVALID_PARAMETER; + if (!pinfo->pszAlgId) return STATUS_INVALID_SIGNATURE; + + if (!strcmpW( pinfo->pszAlgId, BCRYPT_SHA1_ALGORITHM )) hash_algo = GNUTLS_DIG_SHA1; + else if (!strcmpW( pinfo->pszAlgId, BCRYPT_SHA256_ALGORITHM )) hash_algo = GNUTLS_DIG_SHA256; + else if (!strcmpW( pinfo->pszAlgId, BCRYPT_SHA384_ALGORITHM )) hash_algo = GNUTLS_DIG_SHA384; + else if (!strcmpW( pinfo->pszAlgId, BCRYPT_SHA512_ALGORITHM )) hash_algo = GNUTLS_DIG_SHA512; + else + { + FIXME( "Hash algorithm %s not supported\n", debugstr_w(pinfo->pszAlgId) ); + return STATUS_NOT_SUPPORTED; + } + } + else { - case 32: hash_algo = GNUTLS_DIG_SHA256; break; - case 48: hash_algo = GNUTLS_DIG_SHA384; break; + if (flags) + FIXME( "Flags %08x not supported\n", flags ); - default: - FIXME( "Hash size %u not yet supported\n", hash_len ); - return STATUS_INVALID_SIGNATURE; + /* only the hash size must match, not the actual hash function */ + switch (hash_len) + { + case 32: hash_algo = GNUTLS_DIG_SHA256; break; + case 48: hash_algo = GNUTLS_DIG_SHA384; break; + + default: + FIXME( "Hash size %u not yet supported\n", hash_len ); + return STATUS_INVALID_SIGNATURE; + } } switch (key->alg_id) @@ -1501,6 +1578,9 @@ static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *ha case ALG_ID_ECDSA_P384: pk_algo = GNUTLS_PK_ECC; break; + case ALG_ID_RSA: + pk_algo = GNUTLS_PK_RSA; + break; default: FIXME( "Algorithm %d not yet supported\n", key->alg_id ); @@ -1526,7 +1606,8 @@ static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *ha gnutls_hash.size = hash_len; ret = pgnutls_pubkey_verify_hash2( gnutls_key, sign_algo, 0, &gnutls_hash, &gnutls_signature ); - heap_free( gnutls_signature.data ); + if (gnutls_signature.data != signature) + heap_free( gnutls_signature.data ); pgnutls_pubkey_deinit( gnutls_key ); return (ret < 0) ? STATUS_INVALID_SIGNATURE : STATUS_SUCCESS; } @@ -1986,6 +2067,33 @@ NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HAN *ret_key = key; return STATUS_SUCCESS; } + else if (!strcmpW( type, BCRYPT_RSAPUBLIC_BLOB )) + { + BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; + + if (input_len < sizeof(*rsa_blob)) + return STATUS_INVALID_PARAMETER; + + if (alg->id != ALG_ID_RSA) + return STATUS_NOT_SUPPORTED; + + if (rsa_blob->Magic != BCRYPT_RSAPUBLIC_MAGIC) + return STATUS_NOT_SUPPORTED; + + if (!(key = heap_alloc( sizeof(*key) ))) + return STATUS_NO_MEMORY; + + key->hdr.magic = MAGIC_KEY; + if ((status = key_asymmetric_init( key, alg, (BYTE *)rsa_blob, + sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus ))) + { + heap_free( key ); + return status; + } + + *ret_key = key; + return STATUS_SUCCESS; + } FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_SUPPORTED; diff --git a/include/bcrypt.h b/include/bcrypt.h index f28b0d3..df54f62 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -63,6 +63,8 @@ typedef LONG NTSTATUS; #define BCRYPT_AES_WRAP_KEY_BLOB (const WCHAR []){'R','f','c','3','5','6','5','K','e','y','W','r','a','p','B','l','o','b',0} #define BCRYPT_ECCPUBLIC_BLOB (const WCHAR []){'E','C','C','P','U','B','L','I','C','B','L','O','B',0} #define BCRYPT_ECCPRIVATE_BLOB (const WCHAR []){'E','C','C','P','R','I','V','A','T','E','B','L','O','B',0} +#define BCRYPT_RSAPUBLIC_BLOB (const WCHAR []){'R','S','A','P','U','B','L','I','C','B','L','O','B',0} +#define BCRYPT_RSAPRIVATE_BLOB (const WCHAR []){'R','S','A','P','R','I','V','A','T','E','B','L','O','B',0} #define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} @@ -74,6 +76,7 @@ typedef LONG NTSTATUS; #define BCRYPT_MD4_ALGORITHM (const WCHAR []){'M','D','4',0} #define BCRYPT_MD5_ALGORITHM (const WCHAR []){'M','D','5',0} #define BCRYPT_RNG_ALGORITHM (const WCHAR []){'R','N','G',0} +#define BCRYPT_RSA_ALGORITHM (const WCHAR []){'R','S','A',0} #define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0} #define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} #define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} @@ -133,6 +136,20 @@ typedef struct _BCRYPT_ECCKEY_BLOB ULONG cbKey; } BCRYPT_ECCKEY_BLOB, *PBCRYPT_ECCKEY_BLOB; +#define BCRYPT_RSAPUBLIC_MAGIC 0x31415352 +#define BCRYPT_RSAPRIVATE_MAGIC 0x32415352 +#define BCRYPT_RSAFULLPRIVATE_MAGIC 0x33415352 + +typedef struct _BCRYPT_RSAKEY_BLOB +{ + ULONG Magic; + ULONG BitLength; + ULONG cbPublicExp; + ULONG cbModulus; + ULONG cbPrime1; + ULONG cbPrime2; +} BCRYPT_RSAKEY_BLOB; + typedef struct _BCRYPT_PKCS1_PADDING_INFO { LPCWSTR pszAlgId; -- 1.9.1

1 0

[PATCH 3/6] bcrypt: Implement BCryptVerifySignature for ecdsa signatures.
by Alistair Leslie-Hughes 26 Mar '18

26 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 343 +++++++++++++++++++++++++++++++++++++++++++-- dlls/bcrypt/tests/bcrypt.c | 4 +- 2 files changed, 337 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index afa8f2a..ee6c211 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -27,6 +27,7 @@ #elif defined(HAVE_GNUTLS_CIPHER_INIT) #include <gnutls/gnutls.h> #include <gnutls/crypto.h> +#include <gnutls/abstract.h> #endif #include "ntstatus.h" @@ -50,9 +51,31 @@ static HINSTANCE instance; #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); +#if GNUTLS_VERSION_MAJOR < 3 +#define GNUTLS_CIPHER_AES_192_CBC 92 +#define GNUTLS_CIPHER_AES_128_GCM 93 +#define GNUTLS_CIPHER_AES_256_GCM 94 +#define GNUTLS_PK_ECC 4 + +typedef enum +{ + GNUTLS_ECC_CURVE_INVALID = 0, + GNUTLS_ECC_CURVE_SECP224R1, + GNUTLS_ECC_CURVE_SECP256R1, + GNUTLS_ECC_CURVE_SECP384R1, + GNUTLS_ECC_CURVE_SECP521R1, +} gnutls_ecc_curve_t; +#endif + /* Not present in gnutls version < 3.0 */ static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size); static int (*pgnutls_cipher_add_auth)(gnutls_cipher_hd_t handle, const void *ptext, size_t ptext_size); +static int (*pgnutls_pubkey_import_ecc_raw)(gnutls_pubkey_t key, gnutls_ecc_curve_t curve, + const gnutls_datum_t *x, const gnutls_datum_t *y); +static gnutls_sign_algorithm_t (*pgnutls_pk_to_sign)(gnutls_pk_algorithm_t pk, gnutls_digest_algorithm_t hash); +static int (*pgnutls_pubkey_verify_hash2)(gnutls_pubkey_t key, gnutls_sign_algorithm_t algo, + unsigned int flags, const gnutls_datum_t *hash, + const gnutls_datum_t *signature); static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -65,14 +88,10 @@ MAKE_FUNCPTR(gnutls_global_init); MAKE_FUNCPTR(gnutls_global_set_log_function); MAKE_FUNCPTR(gnutls_global_set_log_level); MAKE_FUNCPTR(gnutls_perror); +MAKE_FUNCPTR(gnutls_pubkey_init); +MAKE_FUNCPTR(gnutls_pubkey_deinit); #undef MAKE_FUNCPTR -#if GNUTLS_VERSION_MAJOR < 3 -#define GNUTLS_CIPHER_AES_192_CBC 92 -#define GNUTLS_CIPHER_AES_128_GCM 93 -#define GNUTLS_CIPHER_AES_256_GCM 94 -#endif - static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void *tag, size_t tag_size) { return GNUTLS_E_UNKNOWN_CIPHER_TYPE; @@ -83,6 +102,24 @@ static int compat_gnutls_cipher_add_auth(gnutls_cipher_hd_t handle, const void * return GNUTLS_E_UNKNOWN_CIPHER_TYPE; } +static int compat_gnutls_pubkey_import_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_curve_t curve, + const gnutls_datum_t *x, const gnutls_datum_t *y) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + +static gnutls_sign_algorithm_t compat_gnutls_pk_to_sign(gnutls_pk_algorithm_t pk, gnutls_digest_algorithm_t hash) +{ + return GNUTLS_SIGN_UNKNOWN; +} + +static int compat_gnutls_pubkey_verify_hash2(gnutls_pubkey_t key, gnutls_sign_algorithm_t algo, + unsigned int flags, const gnutls_datum_t *hash, + const gnutls_datum_t *signature) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -114,6 +151,8 @@ static BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_global_set_log_function) LOAD_FUNCPTR(gnutls_global_set_log_level) LOAD_FUNCPTR(gnutls_perror) + LOAD_FUNCPTR(gnutls_pubkey_init); + LOAD_FUNCPTR(gnutls_pubkey_deinit); #undef LOAD_FUNCPTR if (!(pgnutls_cipher_tag = wine_dlsym( libgnutls_handle, "gnutls_cipher_tag", NULL, 0 ))) @@ -132,6 +171,21 @@ static BOOL gnutls_initialize(void) pgnutls_perror( ret ); goto fail; } + if (!(pgnutls_pubkey_import_ecc_raw = wine_dlsym( libgnutls_handle, "gnutls_pubkey_import_ecc_raw", NULL, 0 ))) + { + WARN("gnutls_pubkey_import_ecc_raw not found\n"); + pgnutls_pubkey_import_ecc_raw = compat_gnutls_pubkey_import_ecc_raw; + } + if (!(pgnutls_pk_to_sign = wine_dlsym( libgnutls_handle, "gnutls_pk_to_sign", NULL, 0 ))) + { + WARN("gnutls_pk_to_sign not found\n"); + pgnutls_pk_to_sign = compat_gnutls_pk_to_sign; + } + if (!(pgnutls_pubkey_verify_hash2 = wine_dlsym( libgnutls_handle, "gnutls_pubkey_verify_hash2", NULL, 0 ))) + { + WARN("gnutls_pubkey_verify_hash2 not found\n"); + pgnutls_pubkey_verify_hash2 = compat_gnutls_pubkey_verify_hash2; + } if (TRACE_ON( bcrypt )) { @@ -1219,6 +1273,264 @@ static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) return STATUS_SUCCESS; } +struct buffer +{ + BYTE *buffer; + DWORD length; + DWORD pos; + BOOL error; +}; + +static void buffer_init( struct buffer *buffer ) +{ + buffer->buffer = NULL; + buffer->length = 0; + buffer->pos = 0; + buffer->error = FALSE; +} + +static void buffer_free( struct buffer *buffer ) +{ + heap_free( buffer->buffer ); +} + +static void buffer_append( struct buffer *buffer, BYTE *data, DWORD len ) +{ + if (!len) return; + + if (buffer->pos + len > buffer->length) + { + DWORD new_length = max( max( buffer->pos + len, buffer->length * 2 ), 64 ); + BYTE *new_buffer; + + if (buffer->buffer) + new_buffer = heap_realloc( buffer->buffer, new_length ); + else + new_buffer = heap_alloc( new_length ); + + if (!new_buffer) + { + ERR( "out of memory\n" ); + buffer->error = TRUE; + return; + } + + buffer->buffer = new_buffer; + buffer->length = new_length; + } + + memcpy( &buffer->buffer[buffer->pos], data, len ); + buffer->pos += len; +} + +static void buffer_append_byte( struct buffer *buffer, BYTE value ) +{ + buffer_append( buffer, &value, sizeof(value) ); +} + +static void buffer_append_asn1_length( struct buffer *buffer, DWORD length ) +{ + DWORD num_bytes; + + if (length < 128) + { + buffer_append_byte( buffer, length ); + return; + } + + if (length <= 0xff) num_bytes = 1; + else if (length <= 0xffff) num_bytes = 2; + else if (length <= 0xffffff) num_bytes = 3; + else num_bytes = 4; + + buffer_append_byte( buffer, 0x80 | num_bytes ); + while (num_bytes--) + buffer_append_byte( buffer, length >> (num_bytes * 8) ); +} + +static void buffer_append_asn1_integer( struct buffer *buffer, BYTE *data, DWORD len ) +{ + DWORD leading_zero = (*data & 0x80) != 0; + + buffer_append_byte( buffer, 0x02 ); /* tag */ + buffer_append_asn1_length( buffer, len + leading_zero ); + if (leading_zero) buffer_append_byte( buffer, 0 ); + buffer_append( buffer, data, len ); +} + +static void buffer_append_asn1_sequence( struct buffer *buffer, struct buffer *content ) +{ + if (content->error) + { + buffer->error = TRUE; + return; + } + + buffer_append_byte( buffer, 0x30 ); /* tag */ + buffer_append_asn1_length( buffer, content->pos ); + buffer_append( buffer, content->buffer, content->pos ); +} + +static void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE *s, DWORD s_len ) +{ + struct buffer value; + + buffer_init( &value ); + buffer_append_asn1_integer( &value, r, r_len ); + buffer_append_asn1_integer( &value, s, s_len ); + buffer_append_asn1_sequence( buffer, &value ); + buffer_free( &value ); +} + +static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnutls_key ) +{ + gnutls_ecc_curve_t curve; + gnutls_datum_t x, y; + int ret; + + switch (key->alg_id) + { + case ALG_ID_ECDSA_P256: curve = GNUTLS_ECC_CURVE_SECP256R1; break; + case ALG_ID_ECDSA_P384: curve = GNUTLS_ECC_CURVE_SECP384R1; break; + + default: + FIXME( "Algorithm %d not yet supported\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + + if ((ret = pgnutls_pubkey_init( gnutls_key ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + x.data = key->u.a.pubkey; + x.size = key->u.a.pubkey_len / 2; + y.data = key->u.a.pubkey + x.size; + y.size = x.size; + + if ((ret = pgnutls_pubkey_import_ecc_raw( *gnutls_key, curve, &x, &y ))) + { + pgnutls_perror( ret ); + pgnutls_pubkey_deinit( *gnutls_key ); + return STATUS_INTERNAL_ERROR; + } + + 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 ); + + default: + FIXME("Algorithm %d not yet supported\n", key->alg_id); + return STATUS_NOT_IMPLEMENTED; + } +} + +static NTSTATUS prepare_gnutls_signature_ecc( struct key *key, UCHAR *signature, ULONG signature_len, + gnutls_datum_t *gnutls_signature ) +{ + struct buffer buffer; + DWORD r_len = signature_len / 2; + DWORD s_len = r_len; + BYTE *r = signature; + BYTE *s = signature + r_len; + + buffer_init( &buffer ); + buffer_append_asn1_r_s( &buffer, r, r_len, s, s_len ); + if (buffer.error) + { + buffer_free( &buffer ); + return STATUS_NO_MEMORY; + } + + gnutls_signature->data = buffer.buffer; + gnutls_signature->size = buffer.pos; + return STATUS_SUCCESS; +} + +static NTSTATUS prepare_gnutls_signature( struct key *key, UCHAR *signature, ULONG signature_len, + gnutls_datum_t *gnutls_signature ) +{ + switch (key->alg_id) + { + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + return prepare_gnutls_signature_ecc( key, signature, signature_len, gnutls_signature ); + + default: + FIXME( "Algorithm %d not yet supported\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } +} + +static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, + UCHAR *signature, ULONG signature_len, DWORD flags ) +{ + gnutls_digest_algorithm_t hash_algo; + gnutls_sign_algorithm_t sign_algo; + gnutls_datum_t gnutls_hash, gnutls_signature; + gnutls_pk_algorithm_t pk_algo; + gnutls_pubkey_t gnutls_key; + NTSTATUS status; + int ret; + + if (flags) + FIXME( "Flags %08x not supported\n", flags ); + + /* only the hash size must match, not the actual hash function */ + switch (hash_len) + { + case 32: hash_algo = GNUTLS_DIG_SHA256; break; + case 48: hash_algo = GNUTLS_DIG_SHA384; break; + + default: + FIXME( "Hash size %u not yet supported\n", hash_len ); + return STATUS_INVALID_SIGNATURE; + } + + switch (key->alg_id) + { + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + pk_algo = GNUTLS_PK_ECC; + break; + + default: + FIXME( "Algorithm %d not yet supported\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + + if ((sign_algo = pgnutls_pk_to_sign( pk_algo, hash_algo )) == GNUTLS_SIGN_UNKNOWN) + { + FIXME("Gnutls does not support algorithm %d with hash len %u\n", key->alg_id, hash_len); + return STATUS_NOT_IMPLEMENTED; + } + + if ((status = import_gnutls_pubkey( key, &gnutls_key ))) + return status; + + if ((status = prepare_gnutls_signature( key, signature, signature_len, &gnutls_signature ))) + { + pgnutls_pubkey_deinit( gnutls_key ); + return status; + } + + gnutls_hash.data = hash; + gnutls_hash.size = hash_len; + ret = pgnutls_pubkey_verify_hash2( gnutls_key, sign_algo, 0, &gnutls_hash, &gnutls_signature ); + + heap_free( gnutls_signature.data ); + pgnutls_pubkey_deinit( gnutls_key ); + return (ret < 0) ? STATUS_INVALID_SIGNATURE : STATUS_SUCCESS; +} + static NTSTATUS key_destroy( struct key *key ) { if(key_is_symmetric(key)) @@ -1382,6 +1694,13 @@ static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, + UCHAR *signature, ULONG signature_len, DWORD flags ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->u.s.ref_encrypt) CCCryptorRelease( key->u.s.ref_encrypt ); @@ -1447,6 +1766,13 @@ static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, + UCHAR *signature, ULONG signature_len, DWORD flags ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { ERR( "support for keys not available at build time\n" ); @@ -1670,13 +1996,14 @@ NTSTATUS WINAPI BCryptVerifySignature( BCRYPT_KEY_HANDLE handle, void *padding, { struct key *key = handle; - FIXME( "%p, %p, %p, %u, %p, %u, %08x: stub!\n", handle, padding, hash, + TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", handle, padding, hash, hash_len, signature, signature_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!hash || !hash_len || !signature || !signature_len) return STATUS_INVALID_PARAMETER; if (!key_is_asymmetric(key)) return STATUS_NOT_SUPPORTED; - return STATUS_NOT_IMPLEMENTED; + return key_asymmetric_verify( key, padding, hash, hash_len, signature, signature_len, flags ); } NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index fa244d1..57d0488 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1486,10 +1486,10 @@ static void test_ECDSA(void) ok(!status, "BCryptImportKeyPair failed: %08x\n", status); status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); - todo_wine ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); + ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); - todo_wine ok(!status, "BCryptVerifySignature failed: %08x\n", status); + ok(!status, "BCryptVerifySignature failed: %08x\n", status); pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0); -- 1.9.1

1 0

[PATCH 2/6] bcrypt: Implement importing of ecdsa keys.
by Alistair Leslie-Hughes 26 Mar '18

26 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt.spec | 4 +- dlls/bcrypt/bcrypt_main.c | 160 +++++++++++++++++++++++++++++++++++++++++++-- dlls/bcrypt/tests/bcrypt.c | 4 +- include/bcrypt.h | 2 + 4 files changed, 161 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 28c2394..78824d7 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -32,7 +32,7 @@ @ stdcall BCryptHash(ptr ptr long ptr long ptr long) @ stdcall BCryptHashData(ptr ptr long long) @ stdcall BCryptImportKey(ptr ptr wstr ptr ptr long ptr long long) -@ stub BCryptImportKeyPair +@ stdcall BCryptImportKeyPair(ptr ptr wstr ptr ptr long long) @ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) @ stub BCryptQueryContextConfiguration @ stub BCryptQueryContextFunctionConfiguration @@ -50,7 +50,7 @@ @ stub BCryptSignHash @ stub BCryptUnregisterConfigChangeNotify @ stdcall BCryptUnregisterProvider(wstr) -@ stub BCryptVerifySignature +@ stdcall BCryptVerifySignature(ptr ptr ptr long ptr long long) @ stub GetAsymmetricEncryptionInterface @ stub GetCipherInterface @ stub GetHashInterface diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 3d31e76..afa8f2a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -220,7 +220,9 @@ enum alg_id ALG_ID_SHA1, ALG_ID_SHA256, ALG_ID_SHA384, - ALG_ID_SHA512 + ALG_ID_SHA512, + ALG_ID_ECDSA_P256, + ALG_ID_ECDSA_P384, }; enum mode_id @@ -248,7 +250,9 @@ static const struct { /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM, FALSE }, /* ALG_ID_SHA256 */ { 286, 32, 512, BCRYPT_SHA256_ALGORITHM, FALSE }, /* ALG_ID_SHA384 */ { 382, 48, 1024, BCRYPT_SHA384_ALGORITHM, FALSE }, - /* ALG_ID_SHA512 */ { 382, 64, 1024, BCRYPT_SHA512_ALGORITHM, FALSE } + /* ALG_ID_SHA512 */ { 382, 64, 1024, BCRYPT_SHA512_ALGORITHM, FALSE }, + /* ALG_ID_ECDSA_P256 */ { 0, 0, 0, BCRYPT_ECDSA_P256_ALGORITHM, FALSE }, + /* ALG_ID_ECDSA_P384 */ { 0, 0, 0, BCRYPT_ECDSA_P384_ALGORITHM, FALSE }, }; struct algorithm @@ -324,6 +328,8 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256; else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; else if (!strcmpW( id, BCRYPT_SHA512_ALGORITHM )) alg_id = ALG_ID_SHA512; + else if (!strcmpW( id, BCRYPT_ECDSA_P256_ALGORITHM )) alg_id = ALG_ID_ECDSA_P256; + else if (!strcmpW( id, BCRYPT_ECDSA_P384_ALGORITHM )) alg_id = ALG_ID_ECDSA_P384; else { FIXME( "algorithm %s not supported\n", debugstr_w(id) ); @@ -866,6 +872,12 @@ struct key_symmetric ULONG secret_len; }; +struct key_asymmetric +{ + UCHAR *pubkey; + ULONG pubkey_len; +}; + struct key { struct object hdr; @@ -873,6 +885,7 @@ struct key union { struct key_symmetric s; + struct key_asymmetric a; } u; }; @@ -887,6 +900,12 @@ struct key_symmetric ULONG secret_len; }; +struct key_asymmetric +{ + UCHAR *pubkey; + ULONG pubkey_len; +}; + struct key { struct object hdr; @@ -894,6 +913,7 @@ struct key union { struct key_symmetric s; + struct key_asymmetric a; } u; }; #else @@ -986,11 +1006,42 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) } else { - return STATUS_NOT_IMPLEMENTED; + if (!(buffer = heap_alloc( 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.pubkey = buffer; + key_copy->u.a.pubkey_len = key_orig->u.a.pubkey_len; } return STATUS_SUCCESS; } + +static NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, const UCHAR *pubkey, ULONG pubkey_len ) +{ + UCHAR *buffer; + + if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; + + switch (alg->id) + { + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + break; + + default: + FIXME( "algorithm %u not supported\n", alg->id ); + return STATUS_NOT_SUPPORTED; + } + + if (!(buffer = heap_alloc( pubkey_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, pubkey, pubkey_len ); + + key->alg_id = alg->id; + key->u.a.pubkey = buffer; + key->u.a.pubkey_len = pubkey_len; + + return STATUS_SUCCESS; +} #endif #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) @@ -1170,8 +1221,13 @@ static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) static NTSTATUS key_destroy( struct key *key ) { - if (key->u.s.handle) pgnutls_cipher_deinit( key->u.s.handle ); - heap_free( key->u.s.secret ); + if(key_is_symmetric(key)) + { + if (key->u.s.handle) pgnutls_cipher_deinit( key->u.s.handle ); + heap_free( key->u.s.secret ); + } + else + heap_free( key->u.a.pubkey ); heap_free( key ); return STATUS_SUCCESS; } @@ -1341,6 +1397,12 @@ static NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, cons return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, const UCHAR *pubkey, ULONG pubkey_len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) { ERR( "support for keys not available at build time\n" ); @@ -1403,6 +1465,12 @@ static inline BOOL key_is_symmetric( struct key *key ) return FALSE; } +static inline BOOL key_is_asymmetric( struct key *key ) +{ + ERR( "support for keys not available at build time\n" ); + return FALSE; +} + static NTSTATUS key_symmetric_get_mode( struct key *key, enum mode_id *mode ) { *mode = key->u.s.mode; @@ -1529,6 +1597,88 @@ NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE return STATUS_SUCCESS; } +NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, + BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len, ULONG flags ) +{ + struct algorithm *alg = algorithm; + NTSTATUS status; + struct key *key; + + TRACE( "%p, %p, %s, %p, %p, %u, %u\n", algorithm, decrypt_key, debugstr_w(type), ret_key, input, input_len, flags ); + + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + if (!ret_key || !type || !input) return STATUS_INVALID_PARAMETER; + + *ret_key = NULL; + + if (decrypt_key) + { + FIXME( "decrypting of key not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + if (!strcmpW( type, BCRYPT_ECCPUBLIC_BLOB )) + { + BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; + DWORD key_size, magic; + + if (input_len < sizeof(*ecc_blob)) + return STATUS_INVALID_PARAMETER; + + switch (alg->id) + { + case ALG_ID_ECDSA_P256: + key_size = 32; + magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + break; + case ALG_ID_ECDSA_P384: + key_size = 48; + magic = BCRYPT_ECDSA_PUBLIC_P384_MAGIC; + break; + + default: + FIXME("Algorithm %d does not yet support importing blob of type: %s\n", alg->id, debugstr_w(type)); + return STATUS_NOT_SUPPORTED; + } + + if (ecc_blob->dwMagic != magic) + return STATUS_NOT_SUPPORTED; + + if (ecc_blob->cbKey != key_size) + return STATUS_INVALID_PARAMETER; + + if (!(key = heap_alloc( sizeof(*key) ))) + return STATUS_NO_MEMORY; + + key->hdr.magic = MAGIC_KEY; + if ((status = key_asymmetric_init( key, alg, (BYTE *)(ecc_blob + 1), ecc_blob->cbKey * 2 ))) + { + heap_free( key ); + return status; + } + + *ret_key = key; + return STATUS_SUCCESS; + } + + FIXME( "unsupported key type %s\n", debugstr_w(type) ); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS WINAPI BCryptVerifySignature( BCRYPT_KEY_HANDLE handle, void *padding, UCHAR *hash, ULONG hash_len, + UCHAR *signature, ULONG signature_len, ULONG flags ) +{ + struct key *key = handle; + + FIXME( "%p, %p, %p, %u, %p, %u, %08x: stub!\n", handle, padding, hash, + hash_len, signature, signature_len, flags ); + + if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!key_is_asymmetric(key)) return STATUS_NOT_SUPPORTED; + + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) { struct key *key = handle; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 57d0488..fa244d1 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1486,10 +1486,10 @@ static void test_ECDSA(void) ok(!status, "BCryptImportKeyPair failed: %08x\n", status); status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); - ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); + todo_wine ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); - ok(!status, "BCryptVerifySignature failed: %08x\n", status); + todo_wine ok(!status, "BCryptVerifySignature failed: %08x\n", status); pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0); diff --git a/include/bcrypt.h b/include/bcrypt.h index 717d77c..f28b0d3 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -211,8 +211,10 @@ NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *); NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptHash(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, PUCHAR, ULONG); NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptImportKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); NTSTATUS WINAPI BCryptSetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDuplicateHash(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG); +NTSTATUS WINAPI BCryptVerifySignature(BCRYPT_KEY_HANDLE, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG); #endif /* __WINE_BCRYPT_H */ -- 1.9.1

1 0

[PATCH 1/6] bcrypt: Preparation for asymmetric keys.
by Alistair Leslie-Hughes 26 Mar '18

26 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 346 +++++++++++++++++++++++++++++----------------- 1 file changed, 217 insertions(+), 129 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 69d5129..3d31e76 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -238,16 +238,17 @@ static const struct { ULONG hash_length; ULONG block_bits; const WCHAR *alg_name; + BOOL symmetric; } alg_props[] = { - /* ALG_ID_AES */ { 654, 0, 0, BCRYPT_AES_ALGORITHM }, - /* ALG_ID_MD2 */ { 270, 16, 128, BCRYPT_MD2_ALGORITHM }, - /* ALG_ID_MD4 */ { 270, 16, 512, BCRYPT_MD4_ALGORITHM }, - /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM }, - /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM }, - /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM }, - /* ALG_ID_SHA256 */ { 286, 32, 512, BCRYPT_SHA256_ALGORITHM }, - /* ALG_ID_SHA384 */ { 382, 48, 1024, BCRYPT_SHA384_ALGORITHM }, - /* ALG_ID_SHA512 */ { 382, 64, 1024, BCRYPT_SHA512_ALGORITHM } + /* ALG_ID_AES */ { 654, 0, 0, BCRYPT_AES_ALGORITHM, TRUE }, + /* ALG_ID_MD2 */ { 270, 16, 128, BCRYPT_MD2_ALGORITHM, FALSE }, + /* ALG_ID_MD4 */ { 270, 16, 512, BCRYPT_MD4_ALGORITHM, FALSE }, + /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM, FALSE }, + /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM, FALSE }, + /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM, FALSE }, + /* ALG_ID_SHA256 */ { 286, 32, 512, BCRYPT_SHA256_ALGORITHM, FALSE }, + /* ALG_ID_SHA384 */ { 382, 48, 1024, BCRYPT_SHA384_ALGORITHM, FALSE }, + /* ALG_ID_SHA512 */ { 382, 64, 1024, BCRYPT_SHA512_ALGORITHM, FALSE } }; struct algorithm @@ -856,21 +857,28 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se } #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) -struct key +struct key_symmetric { - struct object hdr; - enum alg_id alg_id; enum mode_id mode; ULONG block_size; gnutls_cipher_hd_t handle; UCHAR *secret; ULONG secret_len; }; -#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 + struct key { - struct object hdr; - enum alg_id alg_id; + struct object hdr; + enum alg_id alg_id; + union + { + struct key_symmetric s; + } u; +}; + +#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +struct key_symmetric +{ enum mode_id mode; ULONG block_size; CCCryptorRef ref_encrypt; @@ -878,16 +886,56 @@ struct key UCHAR *secret; ULONG secret_len; }; -#else + struct key { - struct object hdr; + struct object hdr; + enum alg_id alg_id; + union + { + struct key_symmetric s; + } u; +}; +#else +struct key_symmetric +{ enum mode_id mode; ULONG block_size; }; + +struct key +{ + struct object hdr; + union + { + struct key_symmetric s; + } u; +}; #endif #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +static inline BOOL key_is_symmetric( struct key *key ) +{ + return alg_props[key->alg_id].symmetric; +} + +static inline BOOL key_is_asymmetric( struct key *key ) +{ + return !alg_props[key->alg_id].symmetric; +} + +static NTSTATUS key_symmetric_get_mode( struct key *key, enum mode_id *mode ) +{ + *mode = key->u.s.mode; + return STATUS_SUCCESS; +} + +static NTSTATUS key_symmetric_get_blocksize( struct key *key, ULONG *size ) +{ + *size = key->u.s.block_size; + return STATUS_SUCCESS; +} + static ULONG get_block_size( struct algorithm *alg ) { ULONG ret = 0, size = sizeof(ret); @@ -900,15 +948,15 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) { BCRYPT_KEY_DATA_BLOB_HEADER *header = (BCRYPT_KEY_DATA_BLOB_HEADER *)output; - ULONG req_size = sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + key->secret_len; + ULONG req_size = sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + key->u.s.secret_len; *size = req_size; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; - header->cbKeyData = key->secret_len; - memcpy( &header[1], key->secret, key->secret_len ); + header->cbKeyData = key->u.s.secret_len; + memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); return STATUS_SUCCESS; } @@ -920,23 +968,33 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) { UCHAR *buffer; - if (!(buffer = heap_alloc( key_orig->secret_len ))) return STATUS_NO_MEMORY; - memcpy( buffer, key_orig->secret, key_orig->secret_len ); + key_copy->hdr = key_orig->hdr; + key_copy->alg_id = key_orig->alg_id; - memset( key_copy, 0, sizeof(*key_copy) ); - key_copy->hdr = key_orig->hdr; - key_copy->alg_id = key_orig->alg_id; - key_copy->mode = key_orig->mode; - key_copy->block_size = key_orig->block_size; - key_copy->secret = buffer; - key_copy->secret_len = key_orig->secret_len; + if (key_is_symmetric(key_orig)) + { + if (!(buffer = heap_alloc( key_orig->u.s.secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->u.s.secret, key_orig->u.s.secret_len ); + + memset( key_copy, 0, sizeof(*key_copy) ); + key_copy->hdr = key_orig->hdr; + key_copy->alg_id = key_orig->alg_id; + key_copy->u.s.mode = key_orig->u.s.mode; + key_copy->u.s.block_size = key_orig->u.s.block_size; + key_copy->u.s.secret = buffer; + key_copy->u.s.secret_len = key_orig->u.s.secret_len; + } + else + { + return STATUS_NOT_IMPLEMENTED; + } return STATUS_SUCCESS; } #endif #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) -static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) +static NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; @@ -952,15 +1010,15 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_NOT_SUPPORTED; } - if (!(key->block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; + if (!(key->u.s.block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); - key->alg_id = alg->id; - key->mode = alg->mode; - key->handle = 0; /* initialized on first use */ - key->secret = buffer; - key->secret_len = secret_len; + key->alg_id = alg->id; + key->u.s.mode = alg->mode; + key->u.s.handle = 0; /* initialized on first use */ + key->u.s.secret = buffer; + key->u.s.secret_len = secret_len; return STATUS_SUCCESS; } @@ -971,17 +1029,17 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val { if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) { - key->mode = MODE_ID_ECB; + key->u.s.mode = MODE_ID_ECB; return STATUS_SUCCESS; } else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) { - key->mode = MODE_ID_CBC; + key->u.s.mode = MODE_ID_CBC; return STATUS_SUCCESS; } else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) { - key->mode = MODE_ID_GCM; + key->u.s.mode = MODE_ID_GCM; return STATUS_SUCCESS; } else @@ -1001,22 +1059,22 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { case ALG_ID_AES: WARN( "handle block size\n" ); - switch (key->mode) + switch (key->u.s.mode) { case MODE_ID_GCM: - if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_GCM; - if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_GCM; + if (key->u.s.secret_len == 16) return GNUTLS_CIPHER_AES_128_GCM; + if (key->u.s.secret_len == 32) return GNUTLS_CIPHER_AES_256_GCM; break; case MODE_ID_ECB: /* can be emulated with CBC + empty IV */ case MODE_ID_CBC: - if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_CBC; - if (key->secret_len == 24) return GNUTLS_CIPHER_AES_192_CBC; - if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_CBC; + if (key->u.s.secret_len == 16) return GNUTLS_CIPHER_AES_128_CBC; + if (key->u.s.secret_len == 24) return GNUTLS_CIPHER_AES_192_CBC; + if (key->u.s.secret_len == 32) return GNUTLS_CIPHER_AES_256_CBC; break; default: break; } - FIXME( "aes mode %u with key length %u not supported\n", key->mode, key->secret_len ); + FIXME( "aes mode %u with key length %u not supported\n", key->u.s.mode, key->u.s.secret_len ); return GNUTLS_CIPHER_UNKNOWN; default: FIXME( "algorithm %u not supported\n", key->alg_id ); @@ -1024,30 +1082,30 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) } } -static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) +static NTSTATUS key_symmetric_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { gnutls_cipher_algorithm_t cipher; gnutls_datum_t secret, vector; int ret; - if (key->handle) + if (key->u.s.handle) { - pgnutls_cipher_deinit( key->handle ); - key->handle = NULL; + pgnutls_cipher_deinit( key->u.s.handle ); + key->u.s.handle = NULL; } if ((cipher = get_gnutls_cipher( key )) == GNUTLS_CIPHER_UNKNOWN) return STATUS_NOT_SUPPORTED; - secret.data = key->secret; - secret.size = key->secret_len; + secret.data = key->u.s.secret; + secret.size = key->u.s.secret_len; if (iv) { vector.data = iv; vector.size = iv_len; } - if ((ret = pgnutls_cipher_init( &key->handle, cipher, &secret, iv ? &vector : NULL ))) + if ((ret = pgnutls_cipher_init( &key->u.s.handle, cipher, &secret, &vector ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1056,11 +1114,11 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) return STATUS_SUCCESS; } -static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +static NTSTATUS key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) { int ret; - if ((ret = pgnutls_cipher_add_auth( key->handle, auth_data, len ))) + if ((ret = pgnutls_cipher_add_auth( key->u.s.handle, auth_data, len ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1069,12 +1127,12 @@ static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len return STATUS_SUCCESS; } -static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, +static NTSTATUS key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { int ret; - if ((ret = pgnutls_cipher_encrypt2( key->handle, input, input_len, output, output_len ))) + if ((ret = pgnutls_cipher_encrypt2( key->u.s.handle, input, input_len, output, output_len ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1088,7 +1146,7 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le { int ret; - if ((ret = pgnutls_cipher_decrypt2( key->handle, input, input_len, output, output_len ))) + if ((ret = pgnutls_cipher_decrypt2( key->u.s.handle, input, input_len, output, output_len ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1101,7 +1159,7 @@ static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) { int ret; - if ((ret = pgnutls_cipher_tag( key->handle, tag, len ))) + if ((ret = pgnutls_cipher_tag( key->u.s.handle, tag, len ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1112,13 +1170,13 @@ static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) static NTSTATUS key_destroy( struct key *key ) { - if (key->handle) pgnutls_cipher_deinit( key->handle ); - heap_free( key->secret ); + if (key->u.s.handle) pgnutls_cipher_deinit( key->u.s.handle ); + heap_free( key->u.s.secret ); heap_free( key ); return STATUS_SUCCESS; } #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) +static NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; @@ -1141,16 +1199,16 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_NOT_SUPPORTED; } - if (!(key->block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; + if (!(key->u.s.block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); - key->alg_id = alg->id; - key->mode = alg->mode; - key->ref_encrypt = NULL; /* initialized on first use */ - key->ref_decrypt = NULL; - key->secret = buffer; - key->secret_len = secret_len; + key->alg_id = alg->id; + key->u.s.mode = alg->mode; + key->u.s.ref_encrypt = NULL; /* initialized on first use */ + key->u.s.ref_decrypt = NULL; + key->u.s.secret = buffer; + key->u.s.secret_len = secret_len; return STATUS_SUCCESS; } @@ -1192,54 +1250,54 @@ static CCMode get_cryptor_mode( struct key *key ) } } -static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) +static NTSTATUS key_symmetric_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { CCCryptorStatus status; CCMode mode; if (!(mode = get_cryptor_mode( key ))) return STATUS_NOT_SUPPORTED; - if (key->ref_encrypt) + if (key->u.s.ref_encrypt) { - CCCryptorRelease( key->ref_encrypt ); - key->ref_encrypt = NULL; + CCCryptorRelease( key->u.s.ref_encrypt ); + key->u.s.ref_encrypt = NULL; } - if (key->ref_decrypt) + if (key->u.s.ref_decrypt) { - CCCryptorRelease( key->ref_decrypt ); - key->ref_decrypt = NULL; + CCCryptorRelease( key->u.s.ref_decrypt ); + key->u.s.ref_decrypt = NULL; } if ((status = CCCryptorCreateWithMode( kCCEncrypt, mode, kCCAlgorithmAES128, ccNoPadding, iv, key->secret, - key->secret_len, NULL, 0, 0, 0, &key->ref_encrypt )) != kCCSuccess) + key->u.s.secret, key->u.s.secret_len, NULL, 0, 0, 0, &key->u.s.ref_encrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); return STATUS_INTERNAL_ERROR; } if ((status = CCCryptorCreateWithMode( kCCDecrypt, mode, kCCAlgorithmAES128, ccNoPadding, iv, key->secret, - key->secret_len, NULL, 0, 0, 0, &key->ref_decrypt )) != kCCSuccess) + key->u.s.secret, key->u.s.secret_len, NULL, 0, 0, 0, &key->u.s.ref_decrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); - CCCryptorRelease( key->ref_encrypt ); - key->ref_encrypt = NULL; + CCCryptorRelease( key->u.s.ref_encrypt ); + key->u.s.ref_encrypt = NULL; return STATUS_INTERNAL_ERROR; } return STATUS_SUCCESS; } -static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +static NTSTATUS key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) { FIXME( "not implemented on Mac\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, +static NTSTATUS key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { CCCryptorStatus status; - if ((status = CCCryptorUpdate( key->ref_encrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) + if ((status = CCCryptorUpdate( key->u.s.ref_encrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) { WARN( "CCCryptorUpdate failed %d\n", status ); return STATUS_INTERNAL_ERROR; @@ -1253,7 +1311,7 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le { CCCryptorStatus status; - if ((status = CCCryptorUpdate( key->ref_decrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) + if ((status = CCCryptorUpdate( key->u.s.ref_decrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) { WARN( "CCCryptorUpdate failed %d\n", status ); return STATUS_INTERNAL_ERROR; @@ -1270,14 +1328,14 @@ static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) static NTSTATUS key_destroy( struct key *key ) { - if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); - if (key->ref_decrypt) CCCryptorRelease( key->ref_decrypt ); - heap_free( key->secret ); + if (key->u.s.ref_encrypt) CCCryptorRelease( key->u.s.ref_encrypt ); + if (key->u.s.ref_decrypt) CCCryptorRelease( key->u.s.ref_decrypt ); + heap_free( key->u.s.secret ); heap_free( key ); return STATUS_SUCCESS; } #else -static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) +static NTSTATUS key_symmetric_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1295,19 +1353,19 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) +static NTSTATUS key_symmetric_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +static NTSTATUS key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, +static NTSTATUS key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { ERR( "support for keys not available at build time\n" ); @@ -1338,6 +1396,24 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } + +static inline BOOL key_is_symmetric( struct key *key ) +{ + ERR( "support for keys not available at build time\n" ); + return FALSE; +} + +static NTSTATUS key_symmetric_get_mode( struct key *key, enum mode_id *mode ) +{ + *mode = key->u.s.mode; + return STATUS_SUCCESS; +} + +static NTSTATUS key_symmetric_get_blocksize( struct key *key, ULONG *size ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} #endif NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle, @@ -1356,7 +1432,7 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; - if ((status = key_init( key, alg, secret, secret_len ))) + if ((status = key_symmetric_init( key, alg, secret, secret_len ))) { heap_free( key ); return status; @@ -1470,19 +1546,30 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp struct key *key = handle; ULONG bytes_left = input_len; UCHAR *buf, *src, *dst; + enum mode_id mode; + ULONG block_size; NTSTATUS status; TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + + if (!key_is_symmetric(key)) + { + FIXME( "encryption with asymmetric keys not yet supported\n"); + return STATUS_NOT_IMPLEMENTED; + } + if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not implemented\n", flags ); return STATUS_NOT_IMPLEMENTED; } - if (key->mode == MODE_ID_GCM) + if ((status = key_symmetric_get_mode( key, &mode ))) return status; + + if (mode == MODE_ID_GCM) { BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; @@ -1493,7 +1580,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (auth_info->dwFlags & BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG) FIXME( "call chaining not implemented\n" ); - if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + if ((status = key_symmetric_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) return status; *ret_len = input_len; @@ -1501,44 +1588,45 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (input && !output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; - if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) + if (auth_info->pbAuthData && (status = key_symmetric_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) return status; - if ((status = key_encrypt( key, input, input_len, output, output_len ))) + if ((status = key_symmetric_encrypt( key, input, input_len, output, output_len ))) return status; return key_get_tag( key, auth_info->pbTag, auth_info->cbTag ); } - if ((status = key_set_params( key, iv, iv_len ))) return status; + if ((status = key_symmetric_set_params( key, iv, iv_len ))) return status; + if ((status = key_symmetric_get_blocksize( key, &block_size ))) return status; *ret_len = input_len; if (flags & BCRYPT_BLOCK_PADDING) - *ret_len = (input_len + key->block_size) & ~(key->block_size - 1); - else if (input_len & (key->block_size - 1)) + *ret_len = (input_len + block_size) & ~(block_size - 1); + else if (input_len & (block_size - 1)) return STATUS_INVALID_BUFFER_SIZE; if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; - if (key->mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; + if (mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; src = input; dst = output; - while (bytes_left >= key->block_size) + while (bytes_left >= block_size) { - if ((status = key_encrypt( key, src, key->block_size, dst, key->block_size ))) return status; - if (key->mode == MODE_ID_ECB && (status = key_set_params( key, NULL, 0 ))) return status; - bytes_left -= key->block_size; - src += key->block_size; - dst += key->block_size; + if ((status = key_symmetric_encrypt( key, src, block_size, dst, block_size ))) return status; + if (mode == MODE_ID_ECB && (status = key_symmetric_set_params( key, iv, iv_len ))) return status; + bytes_left -= block_size; + src += block_size; + dst += block_size; } if (flags & BCRYPT_BLOCK_PADDING) { - if (!(buf = heap_alloc( key->block_size ))) return STATUS_NO_MEMORY; + if (!(buf = heap_alloc( block_size ))) return STATUS_NO_MEMORY; memcpy( buf, src, bytes_left ); - memset( buf + bytes_left, key->block_size - bytes_left, key->block_size - bytes_left ); - status = key_encrypt( key, buf, key->block_size, dst, key->block_size ); + memset( buf + bytes_left, block_size - bytes_left, block_size - bytes_left ); + status = key_symmetric_encrypt( key, buf, block_size, dst, block_size ); heap_free( buf ); } @@ -1564,7 +1652,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return STATUS_NOT_IMPLEMENTED; } - if (key->mode == MODE_ID_GCM) + if (key->u.s.mode == MODE_ID_GCM) { BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; UCHAR tag[16]; @@ -1574,7 +1662,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; - if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + if ((status = key_symmetric_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) return status; *ret_len = input_len; @@ -1582,7 +1670,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; - if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) + if (auth_info->pbAuthData && (status = key_symmetric_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) return status; if ((status = key_decrypt( key, input, input_len, output, output_len ))) return status; @@ -1595,42 +1683,42 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return STATUS_SUCCESS; } - if ((status = key_set_params( key, iv, iv_len ))) return status; + if ((status = key_symmetric_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; - if (input_len & (key->block_size - 1)) return STATUS_INVALID_BUFFER_SIZE; + if (input_len & (key->u.s.block_size - 1)) return STATUS_INVALID_BUFFER_SIZE; if (!output) return STATUS_SUCCESS; if (flags & BCRYPT_BLOCK_PADDING) { - if (output_len + key->block_size < *ret_len) return STATUS_BUFFER_TOO_SMALL; - if (input_len < key->block_size) return STATUS_BUFFER_TOO_SMALL; - bytes_left -= key->block_size; + if (output_len + key->u.s.block_size < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (input_len < key->u.s.block_size) return STATUS_BUFFER_TOO_SMALL; + bytes_left -= key->u.s.block_size; } else if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; - if (key->mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; + if (key->u.s.mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; src = input; dst = output; - while (bytes_left >= key->block_size) + while (bytes_left >= key->u.s.block_size) { - if ((status = key_decrypt( key, src, key->block_size, dst, key->block_size ))) return status; - if (key->mode == MODE_ID_ECB && (status = key_set_params( key, NULL, 0 ))) return status; - bytes_left -= key->block_size; - src += key->block_size; - dst += key->block_size; + if ((status = key_decrypt( key, src, key->u.s.block_size, dst, key->u.s.block_size ))) return status; + if (key->u.s.mode == MODE_ID_ECB && (status = key_symmetric_set_params( key, iv, iv_len ))) return status; + bytes_left -= key->u.s.block_size; + src += key->u.s.block_size; + dst += key->u.s.block_size; } if (flags & BCRYPT_BLOCK_PADDING) { - if (!(buf = heap_alloc( key->block_size ))) return STATUS_NO_MEMORY; - status = key_decrypt( key, src, key->block_size, buf, key->block_size ); - if (!status && buf[ key->block_size - 1 ] <= key->block_size) + if (!(buf = heap_alloc( key->u.s.block_size ))) return STATUS_NO_MEMORY; + status = key_decrypt( key, src, key->u.s.block_size, buf, key->u.s.block_size ); + if (!status && buf[ key->u.s.block_size - 1 ] <= key->u.s.block_size) { - *ret_len -= buf[ key->block_size - 1 ]; + *ret_len -= buf[ key->u.s.block_size - 1 ]; if (output_len < *ret_len) status = STATUS_BUFFER_TOO_SMALL; - else memcpy( dst, buf, key->block_size - buf[ key->block_size - 1 ] ); + else memcpy( dst, buf, key->u.s.block_size - buf[ key->u.s.block_size - 1 ] ); } else status = STATUS_UNSUCCESSFUL; /* FIXME: invalid padding */ -- 1.9.1

1 0

[PATCH] winemac: Reenable window autodisplay when the frame is set and redisplayed.
by Ken Thomases 26 Mar '18

26 Mar '18

Cocoa will draw the window frame immediately but if autodisplay of its content view is disabled, that may leave the content area black briefly. This change avoids that flicker. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 991db57..b94b774 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2456,6 +2456,20 @@ - (void) displayIfNeeded [self setAutodisplay:NO]; } + - (void) setFrame:(NSRect)frameRect display:(BOOL)flag + { + if (flag) + [self setAutodisplay:YES]; + [super setFrame:frameRect display:flag]; + } + + - (void) setFrame:(NSRect)frameRect display:(BOOL)displayFlag animate:(BOOL)animateFlag + { + if (displayFlag) + [self setAutodisplay:YES]; + [super setFrame:frameRect display:displayFlag animate:animateFlag]; + } + - (void) windowDidDrawContent { if (!drawnSinceShown) -- 2.10.2

1 0

[PATCH 0/7] Wine Vulkan and Direct3D 12
by Józef Kucia 25 Mar '18

25 Mar '18

The following patch series was written mainly for Direct3D 12 integration. Our Direct3D 12 is going to use host Vulkan, but we want to share platform-specific WSI code with Wine Vulkan. The series makes sense on its own as well, as it lets us to use autogenerated thunks for more Vulkan functions. We add additional requirement for Wine Vulkan drivers: vkGetInstanceProcAddr() and vkGetDeviceProcAddr() must return function pointers to overridden Vulkan functions. This requirement allow us to treat Wine Vulkan driver as host Vulkan implementation extended with VK_KHR_win32_surface. The plan is to make our D3D12 implementation another client of Wine Vulkan driver, i.e. D3D12 is going to call __wine_get_vulkan_driver(). Thanks to this series, we'll be able to pass vkGetInstanceProcAddr() to libvkd3d and tell libvkd3d enable VK_KHR_win32_surface. We could take this idea further and minimize Wine Vulkan driver interface to a single function: vkGetInstanceProcAddr(). The only requirement would be that Wine Vulkan driver has to provide an implementation of VK_KHR_win32_surface. On the other hand, the vulkan_funcs structure makes it more explicit what is expected to be implemented by Wine Vulkan driver. CC: Roderick Colenbrander <thunderbird2k(a)gmail.com> Józef Kucia (7): winevulkan: Get rid of unnecessary forward declarations. winex11: Return Wine Vulkan driver functions from vkGetInstanceProcAddr(). winex11: Return Wine Vulkan driver functions from vkGetDeviceProcAddr(). winevulkan: Generate conversions only for autogenerated thunks. winevulkan: Put all required functions into function tables. winevulkan: Mark explicitly if driver function is needed in dispatch tables. winevulkan: Autogenerate thunks for functions overridden by Wine Vulkan driver. dlls/winevulkan/make_vulkan | 49 +++--- dlls/winevulkan/vulkan.c | 341 +++++++++++----------------------------- dlls/winevulkan/vulkan_thunks.c | 118 ++++++++++++-- dlls/winevulkan/vulkan_thunks.h | 42 +++-- dlls/winex11.drv/vulkan.c | 94 ++++++++++- 5 files changed, 338 insertions(+), 306 deletions(-) -- 2.16.1

2 15

Re: [1/3] msvcrt: Implement _atol_l.
by Stefan Dösinger 25 Mar '18

25 Mar '18

Hello, On 25/03/18 18:03, Hua Meng wrote: > + __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale); > + > + if(ret > LONG_MAX) { > + ret = LONG_MAX; > + *MSVCRT__errno() = MSVCRT_ERANGE; > + } else if(ret < LONG_MIN) { > + ret = LONG_MIN; > + *MSVCRT__errno() = MSVCRT_ERANGE; > + } This looks reasonable. Can you provide a simple test to verify that the function indeed behaves as specified in MSDN?

1 0

[PATCH]calc:Add a simple implementation.
by 孟华 25 Mar '18

25 Mar '18

For bug 15555: https://bugs.winehq.org/show_bug.cgi?id=15555

3 2

[3/3] msvcrt: Return correct value when out of range in _atoldbl.
by Hua Meng 25 Mar '18

25 Mar '18

Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcrt/string.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)

1 0

[2/3] msvcrt: Implement _atoi64_l.
by Hua Meng 25 Mar '18

25 Mar '18

1 0

[1/3] msvcrt: Implement _atol_l.
by Hua Meng 25 Mar '18

25 Mar '18

1 0

[PATCH] comdlg32: Hide Read-only checkbox for Save dialogs
by Nikolay Sivov 25 Mar '18

25 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=36843 dlls/comdlg32/filedlg.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index fa3832cd6f..d788d4fb42 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -158,6 +158,11 @@ static BOOL is_dialog_hooked(const FileOpenDlgInfos *info) return (info->ofnInfos->Flags & OFN_ENABLEHOOK) && info->ofnInfos->lpfnHook; } +static BOOL filedialog_is_readonly_hidden(const FileOpenDlgInfos *info) +{ + return (info->ofnInfos->Flags & OFN_HIDEREADONLY) || (info->DlgInfos.dwDlgProp & FODPROP_SAVEDLG); +} + /*********************************************************************** * Prototypes */ @@ -1838,7 +1843,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } /* Must the open as read only check box be hidden? */ - if(fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) + if (filedialog_is_readonly_hidden(fodInfos)) { ShowWindow(GetDlgItem(hwnd,IDC_OPENREADONLY),SW_HIDE); EnableWindow(GetDlgItem(hwnd, IDC_OPENREADONLY), FALSE); @@ -1882,7 +1887,7 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam) UINT flags = SWP_NOACTIVATE; ArrangeCtrlPositions(fodInfos->DlgInfos.hwndCustomDlg, hwnd, - (fodInfos->ofnInfos->Flags & (OFN_HIDEREADONLY | OFN_SHOWHELP)) == OFN_HIDEREADONLY); + filedialog_is_readonly_hidden(fodInfos) && !(fodInfos->ofnInfos->Flags & OFN_SHOWHELP)); /* resize the custom dialog to the parent size */ if (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE)) @@ -1903,7 +1908,7 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam) /* Resize the height; if opened as read-only, checkbox and help button are * hidden and we are not using a custom template nor a customDialog */ - if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) && + if (filedialog_is_readonly_hidden(fodInfos) && (!(fodInfos->ofnInfos->Flags & (OFN_SHOWHELP|OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE)))) { -- 2.16.2

1 0

Re: GSOC 2018: NEED TO CONTACT MENTOR: ALEX HENRIE
by Alex Henrie 25 Mar '18

25 Mar '18

On Sat, Mar 24, 2018 at 10:23 PM Adeniyi Mayokun <adeniyimayokun17(a)gmail.com> wrote: > Good Day Sir, Yes i do know about the patch and I have submitted and created a pull request on github(pull request #12) and also mailed the patch to wine devel on updating the Parser.l file in the wrc folder but it has not been reviewed yet. The question i have is on implementing the calculator app, I wanted to know if i am to build a new calculator or to make the GNU winecalc work without errors and also know about the proposal format? That patch cannot be accepted into Wine for the reasons Zebediah told you: https://www.winehq.org/pipermail/wine-devel/2018-March/124754.html Patches must be submitted through wine-devel; pull requests on GitHub are ignored. Furthermore, a patch that qualifies you for GSoC has to be your own work (submitting a patch on behalf of someone else does not count, especially if you do not give credit to the original author). We'd like a new calculator app written from scratch. As far as I know, the proposal format is up to you. -Alex

1 0

[PATCH] advapi32: Silence the fixme in EventActivityIdControl
by Stefan Leichter 25 Mar '18

25 Mar '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=44746 Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- dlls/advapi32/eventlog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH] winedevice: Wait until driver has started before returning
by Alistair Leslie-Hughes 24 Mar '18

24 Mar '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=38836 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/winedevice/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 397676d4c0..9da34ec145 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -55,6 +55,7 @@ struct wine_driver struct wine_rb_entry entry; SERVICE_STATUS_HANDLE handle; + HANDLE started; DRIVER_OBJECT *driver_obj; WCHAR name[1]; }; @@ -390,6 +391,8 @@ static void WINAPI async_create_driver( PTP_CALLBACK_INSTANCE instance, void *co goto error; } + SetEvent(driver->started); + EnterCriticalSection( &drivers_cs ); driver->driver_obj = driver_obj; set_service_status( driver->handle, SERVICE_RUNNING, @@ -441,10 +444,16 @@ static NTSTATUS create_driver( const WCHAR *driver_name ) environment.Version = 1; environment.CleanupGroup = cleanup_group; + driver->started = CreateEventW(NULL, TRUE, FALSE, NULL); + /* don't block the service control handler */ if (!TrySubmitThreadpoolCallback( async_create_driver, driver, &environment )) async_create_driver( NULL, driver ); + /* Windows wait 30 Seconds */ + if(WaitForSingleObject(driver->started, 30000) == WAIT_TIMEOUT) + return ERROR_SERVICE_REQUEST_TIMEOUT; + return STATUS_SUCCESS; } @@ -453,6 +462,7 @@ static void wine_drivers_rb_destroy( struct wine_rb_entry *entry, void *context if (unload_driver( entry, TRUE ) != STATUS_SUCCESS) { struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); + CloseHandle(driver->started); ObDereferenceObject( driver->driver_obj ); CloseServiceHandle( (void *)driver->handle ); HeapFree( GetProcessHeap(), 0, driver ); -- 2.16.2

1 0

[PATCH 1/3] libs/port/decompose.c: Implement full Unicode character decomposition.
by Sergio Gómez Del Real 24 Mar '18

24 Mar '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- libs/port/decompose.c | 4340 +++++++++++++++++++++++++++++++++++++++++++------ libs/port/mbtowc.c | 10 +- tools/make_unicode | 420 ++++- 3 files changed, 4236 insertions(+), 534 deletions(-) diff --git a/libs/port/decompose.c b/libs/port/decompose.c index 221d2e0e92..9f77802c88 100644 --- a/libs/port/decompose.c +++ b/libs/port/decompose.c @@ -1,761 +1,4163 @@ -/* Unicode char composition */ +/* Unicode char decomposition */ /* generated from http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" -static const WCHAR table[4704] = +static const UINT last_decomposable = 0x2fa1d; + +static const WCHAR data_decomp[10439] = +{ + 0x0000, 0x0020, 0x0000, 0x0020, 0x0308, 0x0000, 0x0061, 0x0000, + 0x0020, 0x0304, 0x0000, 0x0032, 0x0000, 0x0033, 0x0000, 0x0020, + 0x0301, 0x0000, 0x03bc, 0x0000, 0x0020, 0x0327, 0x0000, 0x0031, + 0x0000, 0x006f, 0x0000, 0x0031, 0x2044, 0x0034, 0x0000, 0x0031, + 0x2044, 0x0032, 0x0000, 0x0033, 0x2044, 0x0034, 0x0000, 0x0041, + 0x0300, 0x0000, 0x0041, 0x0301, 0x0000, 0x0041, 0x0302, 0x0000, + 0x0041, 0x0303, 0x0000, 0x0041, 0x0308, 0x0000, 0x0041, 0x030a, + 0x0000, 0x0043, 0x0327, 0x0000, 0x0045, 0x0300, 0x0000, 0x0045, + 0x0301, 0x0000, 0x0045, 0x0302, 0x0000, 0x0045, 0x0308, 0x0000, + 0x0049, 0x0300, 0x0000, 0x0049, 0x0301, 0x0000, 0x0049, 0x0302, + 0x0000, 0x0049, 0x0308, 0x0000, 0x004e, 0x0303, 0x0000, 0x004f, + 0x0300, 0x0000, 0x004f, 0x0301, 0x0000, 0x004f, 0x0302, 0x0000, + 0x004f, 0x0303, 0x0000, 0x004f, 0x0308, 0x0000, 0x0055, 0x0300, + 0x0000, 0x0055, 0x0301, 0x0000, 0x0055, 0x0302, 0x0000, 0x0055, + 0x0308, 0x0000, 0x0059, 0x0301, 0x0000, 0x0061, 0x0300, 0x0000, + 0x0061, 0x0301, 0x0000, 0x0061, 0x0302, 0x0000, 0x0061, 0x0303, + 0x0000, 0x0061, 0x0308, 0x0000, 0x0061, 0x030a, 0x0000, 0x0063, + 0x0327, 0x0000, 0x0065, 0x0300, 0x0000, 0x0065, 0x0301, 0x0000, + 0x0065, 0x0302, 0x0000, 0x0065, 0x0308, 0x0000, 0x0069, 0x0300, + 0x0000, 0x0069, 0x0301, 0x0000, 0x0069, 0x0302, 0x0000, 0x0069, + 0x0308, 0x0000, 0x006e, 0x0303, 0x0000, 0x006f, 0x0300, 0x0000, + 0x006f, 0x0301, 0x0000, 0x006f, 0x0302, 0x0000, 0x006f, 0x0303, + 0x0000, 0x006f, 0x0308, 0x0000, 0x0075, 0x0300, 0x0000, 0x0075, + 0x0301, 0x0000, 0x0075, 0x0302, 0x0000, 0x0075, 0x0308, 0x0000, + 0x0079, 0x0301, 0x0000, 0x0079, 0x0308, 0x0000, 0x0041, 0x0304, + 0x0000, 0x0061, 0x0304, 0x0000, 0x0041, 0x0306, 0x0000, 0x0061, + 0x0306, 0x0000, 0x0041, 0x0328, 0x0000, 0x0061, 0x0328, 0x0000, + 0x0043, 0x0301, 0x0000, 0x0063, 0x0301, 0x0000, 0x0043, 0x0302, + 0x0000, 0x0063, 0x0302, 0x0000, 0x0043, 0x0307, 0x0000, 0x0063, + 0x0307, 0x0000, 0x0043, 0x030c, 0x0000, 0x0063, 0x030c, 0x0000, + 0x0044, 0x030c, 0x0000, 0x0064, 0x030c, 0x0000, 0x0045, 0x0304, + 0x0000, 0x0065, 0x0304, 0x0000, 0x0045, 0x0306, 0x0000, 0x0065, + 0x0306, 0x0000, 0x0045, 0x0307, 0x0000, 0x0065, 0x0307, 0x0000, + 0x0045, 0x0328, 0x0000, 0x0065, 0x0328, 0x0000, 0x0045, 0x030c, + 0x0000, 0x0065, 0x030c, 0x0000, 0x0047, 0x0302, 0x0000, 0x0067, + 0x0302, 0x0000, 0x0047, 0x0306, 0x0000, 0x0067, 0x0306, 0x0000, + 0x0047, 0x0307, 0x0000, 0x0067, 0x0307, 0x0000, 0x0047, 0x0327, + 0x0000, 0x0067, 0x0327, 0x0000, 0x0048, 0x0302, 0x0000, 0x0068, + 0x0302, 0x0000, 0x0049, 0x0303, 0x0000, 0x0069, 0x0303, 0x0000, + 0x0049, 0x0304, 0x0000, 0x0069, 0x0304, 0x0000, 0x0049, 0x0306, + 0x0000, 0x0069, 0x0306, 0x0000, 0x0049, 0x0328, 0x0000, 0x0069, + 0x0328, 0x0000, 0x0049, 0x0307, 0x0000, 0x0049, 0x004a, 0x0000, + 0x0069, 0x006a, 0x0000, 0x004a, 0x0302, 0x0000, 0x006a, 0x0302, + 0x0000, 0x004b, 0x0327, 0x0000, 0x006b, 0x0327, 0x0000, 0x004c, + 0x0301, 0x0000, 0x006c, 0x0301, 0x0000, 0x004c, 0x0327, 0x0000, + 0x006c, 0x0327, 0x0000, 0x004c, 0x030c, 0x0000, 0x006c, 0x030c, + 0x0000, 0x004c, 0x00b7, 0x0000, 0x006c, 0x00b7, 0x0000, 0x004e, + 0x0301, 0x0000, 0x006e, 0x0301, 0x0000, 0x004e, 0x0327, 0x0000, + 0x006e, 0x0327, 0x0000, 0x004e, 0x030c, 0x0000, 0x006e, 0x030c, + 0x0000, 0x02bc, 0x006e, 0x0000, 0x004f, 0x0304, 0x0000, 0x006f, + 0x0304, 0x0000, 0x004f, 0x0306, 0x0000, 0x006f, 0x0306, 0x0000, + 0x004f, 0x030b, 0x0000, 0x006f, 0x030b, 0x0000, 0x0052, 0x0301, + 0x0000, 0x0072, 0x0301, 0x0000, 0x0052, 0x0327, 0x0000, 0x0072, + 0x0327, 0x0000, 0x0052, 0x030c, 0x0000, 0x0072, 0x030c, 0x0000, + 0x0053, 0x0301, 0x0000, 0x0073, 0x0301, 0x0000, 0x0053, 0x0302, + 0x0000, 0x0073, 0x0302, 0x0000, 0x0053, 0x0327, 0x0000, 0x0073, + 0x0327, 0x0000, 0x0053, 0x030c, 0x0000, 0x0073, 0x030c, 0x0000, + 0x0054, 0x0327, 0x0000, 0x0074, 0x0327, 0x0000, 0x0054, 0x030c, + 0x0000, 0x0074, 0x030c, 0x0000, 0x0055, 0x0303, 0x0000, 0x0075, + 0x0303, 0x0000, 0x0055, 0x0304, 0x0000, 0x0075, 0x0304, 0x0000, + 0x0055, 0x0306, 0x0000, 0x0075, 0x0306, 0x0000, 0x0055, 0x030a, + 0x0000, 0x0075, 0x030a, 0x0000, 0x0055, 0x030b, 0x0000, 0x0075, + 0x030b, 0x0000, 0x0055, 0x0328, 0x0000, 0x0075, 0x0328, 0x0000, + 0x0057, 0x0302, 0x0000, 0x0077, 0x0302, 0x0000, 0x0059, 0x0302, + 0x0000, 0x0079, 0x0302, 0x0000, 0x0059, 0x0308, 0x0000, 0x005a, + 0x0301, 0x0000, 0x007a, 0x0301, 0x0000, 0x005a, 0x0307, 0x0000, + 0x007a, 0x0307, 0x0000, 0x005a, 0x030c, 0x0000, 0x007a, 0x030c, + 0x0000, 0x0073, 0x0000, 0x004f, 0x031b, 0x0000, 0x006f, 0x031b, + 0x0000, 0x0055, 0x031b, 0x0000, 0x0075, 0x031b, 0x0000, 0x0044, + 0x005a, 0x030c, 0x0000, 0x0044, 0x007a, 0x030c, 0x0000, 0x0064, + 0x007a, 0x030c, 0x0000, 0x004c, 0x004a, 0x0000, 0x004c, 0x006a, + 0x0000, 0x006c, 0x006a, 0x0000, 0x004e, 0x004a, 0x0000, 0x004e, + 0x006a, 0x0000, 0x006e, 0x006a, 0x0000, 0x0041, 0x030c, 0x0000, + 0x0061, 0x030c, 0x0000, 0x0049, 0x030c, 0x0000, 0x0069, 0x030c, + 0x0000, 0x004f, 0x030c, 0x0000, 0x006f, 0x030c, 0x0000, 0x0055, + 0x030c, 0x0000, 0x0075, 0x030c, 0x0000, 0x0055, 0x0308, 0x0304, + 0x0000, 0x0075, 0x0308, 0x0304, 0x0000, 0x0055, 0x0308, 0x0301, + 0x0000, 0x0075, 0x0308, 0x0301, 0x0000, 0x0055, 0x0308, 0x030c, + 0x0000, 0x0075, 0x0308, 0x030c, 0x0000, 0x0055, 0x0308, 0x0300, + 0x0000, 0x0075, 0x0308, 0x0300, 0x0000, 0x0041, 0x0308, 0x0304, + 0x0000, 0x0061, 0x0308, 0x0304, 0x0000, 0x0041, 0x0307, 0x0304, + 0x0000, 0x0061, 0x0307, 0x0304, 0x0000, 0x00c6, 0x0304, 0x0000, + 0x00e6, 0x0304, 0x0000, 0x0047, 0x030c, 0x0000, 0x0067, 0x030c, + 0x0000, 0x004b, 0x030c, 0x0000, 0x006b, 0x030c, 0x0000, 0x004f, + 0x0328, 0x0000, 0x006f, 0x0328, 0x0000, 0x004f, 0x0328, 0x0304, + 0x0000, 0x006f, 0x0328, 0x0304, 0x0000, 0x01b7, 0x030c, 0x0000, + 0x0292, 0x030c, 0x0000, 0x006a, 0x030c, 0x0000, 0x0044, 0x005a, + 0x0000, 0x0044, 0x007a, 0x0000, 0x0064, 0x007a, 0x0000, 0x0047, + 0x0301, 0x0000, 0x0067, 0x0301, 0x0000, 0x004e, 0x0300, 0x0000, + 0x006e, 0x0300, 0x0000, 0x0041, 0x030a, 0x0301, 0x0000, 0x0061, + 0x030a, 0x0301, 0x0000, 0x00c6, 0x0301, 0x0000, 0x00e6, 0x0301, + 0x0000, 0x00d8, 0x0301, 0x0000, 0x00f8, 0x0301, 0x0000, 0x0041, + 0x030f, 0x0000, 0x0061, 0x030f, 0x0000, 0x0041, 0x0311, 0x0000, + 0x0061, 0x0311, 0x0000, 0x0045, 0x030f, 0x0000, 0x0065, 0x030f, + 0x0000, 0x0045, 0x0311, 0x0000, 0x0065, 0x0311, 0x0000, 0x0049, + 0x030f, 0x0000, 0x0069, 0x030f, 0x0000, 0x0049, 0x0311, 0x0000, + 0x0069, 0x0311, 0x0000, 0x004f, 0x030f, 0x0000, 0x006f, 0x030f, + 0x0000, 0x004f, 0x0311, 0x0000, 0x006f, 0x0311, 0x0000, 0x0052, + 0x030f, 0x0000, 0x0072, 0x030f, 0x0000, 0x0052, 0x0311, 0x0000, + 0x0072, 0x0311, 0x0000, 0x0055, 0x030f, 0x0000, 0x0075, 0x030f, + 0x0000, 0x0055, 0x0311, 0x0000, 0x0075, 0x0311, 0x0000, 0x0053, + 0x0326, 0x0000, 0x0073, 0x0326, 0x0000, 0x0054, 0x0326, 0x0000, + 0x0074, 0x0326, 0x0000, 0x0048, 0x030c, 0x0000, 0x0068, 0x030c, + 0x0000, 0x0041, 0x0307, 0x0000, 0x0061, 0x0307, 0x0000, 0x0045, + 0x0327, 0x0000, 0x0065, 0x0327, 0x0000, 0x004f, 0x0308, 0x0304, + 0x0000, 0x006f, 0x0308, 0x0304, 0x0000, 0x004f, 0x0303, 0x0304, + 0x0000, 0x006f, 0x0303, 0x0304, 0x0000, 0x004f, 0x0307, 0x0000, + 0x006f, 0x0307, 0x0000, 0x004f, 0x0307, 0x0304, 0x0000, 0x006f, + 0x0307, 0x0304, 0x0000, 0x0059, 0x0304, 0x0000, 0x0079, 0x0304, + 0x0000, 0x0068, 0x0000, 0x0266, 0x0000, 0x006a, 0x0000, 0x0072, + 0x0000, 0x0279, 0x0000, 0x027b, 0x0000, 0x0281, 0x0000, 0x0077, + 0x0000, 0x0079, 0x0000, 0x0020, 0x0306, 0x0000, 0x0020, 0x0307, + 0x0000, 0x0020, 0x030a, 0x0000, 0x0020, 0x0328, 0x0000, 0x0020, + 0x0303, 0x0000, 0x0020, 0x030b, 0x0000, 0x0263, 0x0000, 0x006c, + 0x0000, 0x0078, 0x0000, 0x0295, 0x0000, 0x0300, 0x0000, 0x0301, + 0x0000, 0x0313, 0x0000, 0x0308, 0x0301, 0x0000, 0x02b9, 0x0000, + 0x0020, 0x0345, 0x0000, 0x003b, 0x0000, 0x00a8, 0x0301, 0x0000, + 0x0020, 0x0308, 0x0301, 0x0000, 0x0391, 0x0301, 0x0000, 0x00b7, + 0x0000, 0x0395, 0x0301, 0x0000, 0x0397, 0x0301, 0x0000, 0x0399, + 0x0301, 0x0000, 0x039f, 0x0301, 0x0000, 0x03a5, 0x0301, 0x0000, + 0x03a9, 0x0301, 0x0000, 0x03b9, 0x0308, 0x0301, 0x0000, 0x0399, + 0x0308, 0x0000, 0x03a5, 0x0308, 0x0000, 0x03b1, 0x0301, 0x0000, + 0x03b5, 0x0301, 0x0000, 0x03b7, 0x0301, 0x0000, 0x03b9, 0x0301, + 0x0000, 0x03c5, 0x0308, 0x0301, 0x0000, 0x03b9, 0x0308, 0x0000, + 0x03c5, 0x0308, 0x0000, 0x03bf, 0x0301, 0x0000, 0x03c5, 0x0301, + 0x0000, 0x03c9, 0x0301, 0x0000, 0x03b2, 0x0000, 0x03b8, 0x0000, + 0x03a5, 0x0000, 0x03d2, 0x0301, 0x0000, 0x03d2, 0x0308, 0x0000, + 0x03c6, 0x0000, 0x03c0, 0x0000, 0x03ba, 0x0000, 0x03c1, 0x0000, + 0x03c2, 0x0000, 0x0398, 0x0000, 0x03b5, 0x0000, 0x03a3, 0x0000, + 0x0415, 0x0300, 0x0000, 0x0415, 0x0308, 0x0000, 0x0413, 0x0301, + 0x0000, 0x0406, 0x0308, 0x0000, 0x041a, 0x0301, 0x0000, 0x0418, + 0x0300, 0x0000, 0x0423, 0x0306, 0x0000, 0x0418, 0x0306, 0x0000, + 0x0438, 0x0306, 0x0000, 0x0435, 0x0300, 0x0000, 0x0435, 0x0308, + 0x0000, 0x0433, 0x0301, 0x0000, 0x0456, 0x0308, 0x0000, 0x043a, + 0x0301, 0x0000, 0x0438, 0x0300, 0x0000, 0x0443, 0x0306, 0x0000, + 0x0474, 0x030f, 0x0000, 0x0475, 0x030f, 0x0000, 0x0416, 0x0306, + 0x0000, 0x0436, 0x0306, 0x0000, 0x0410, 0x0306, 0x0000, 0x0430, + 0x0306, 0x0000, 0x0410, 0x0308, 0x0000, 0x0430, 0x0308, 0x0000, + 0x0415, 0x0306, 0x0000, 0x0435, 0x0306, 0x0000, 0x04d8, 0x0308, + 0x0000, 0x04d9, 0x0308, 0x0000, 0x0416, 0x0308, 0x0000, 0x0436, + 0x0308, 0x0000, 0x0417, 0x0308, 0x0000, 0x0437, 0x0308, 0x0000, + 0x0418, 0x0304, 0x0000, 0x0438, 0x0304, 0x0000, 0x0418, 0x0308, + 0x0000, 0x0438, 0x0308, 0x0000, 0x041e, 0x0308, 0x0000, 0x043e, + 0x0308, 0x0000, 0x04e8, 0x0308, 0x0000, 0x04e9, 0x0308, 0x0000, + 0x042d, 0x0308, 0x0000, 0x044d, 0x0308, 0x0000, 0x0423, 0x0304, + 0x0000, 0x0443, 0x0304, 0x0000, 0x0423, 0x0308, 0x0000, 0x0443, + 0x0308, 0x0000, 0x0423, 0x030b, 0x0000, 0x0443, 0x030b, 0x0000, + 0x0427, 0x0308, 0x0000, 0x0447, 0x0308, 0x0000, 0x042b, 0x0308, + 0x0000, 0x044b, 0x0308, 0x0000, 0x0565, 0x0582, 0x0000, 0x0627, + 0x0653, 0x0000, 0x0627, 0x0654, 0x0000, 0x0648, 0x0654, 0x0000, + 0x0627, 0x0655, 0x0000, 0x064a, 0x0654, 0x0000, 0x0627, 0x0674, + 0x0000, 0x0648, 0x0674, 0x0000, 0x06c7, 0x0674, 0x0000, 0x064a, + 0x0674, 0x0000, 0x06d5, 0x0654, 0x0000, 0x06c1, 0x0654, 0x0000, + 0x06d2, 0x0654, 0x0000, 0x0928, 0x093c, 0x0000, 0x0930, 0x093c, + 0x0000, 0x0933, 0x093c, 0x0000, 0x0915, 0x093c, 0x0000, 0x0916, + 0x093c, 0x0000, 0x0917, 0x093c, 0x0000, 0x091c, 0x093c, 0x0000, + 0x0921, 0x093c, 0x0000, 0x0922, 0x093c, 0x0000, 0x092b, 0x093c, + 0x0000, 0x092f, 0x093c, 0x0000, 0x09c7, 0x09be, 0x0000, 0x09c7, + 0x09d7, 0x0000, 0x09a1, 0x09bc, 0x0000, 0x09a2, 0x09bc, 0x0000, + 0x09af, 0x09bc, 0x0000, 0x0a32, 0x0a3c, 0x0000, 0x0a38, 0x0a3c, + 0x0000, 0x0a16, 0x0a3c, 0x0000, 0x0a17, 0x0a3c, 0x0000, 0x0a1c, + 0x0a3c, 0x0000, 0x0a2b, 0x0a3c, 0x0000, 0x0b47, 0x0b56, 0x0000, + 0x0b47, 0x0b3e, 0x0000, 0x0b47, 0x0b57, 0x0000, 0x0b21, 0x0b3c, + 0x0000, 0x0b22, 0x0b3c, 0x0000, 0x0b92, 0x0bd7, 0x0000, 0x0bc6, + 0x0bbe, 0x0000, 0x0bc7, 0x0bbe, 0x0000, 0x0bc6, 0x0bd7, 0x0000, + 0x0c46, 0x0c56, 0x0000, 0x0cbf, 0x0cd5, 0x0000, 0x0cc6, 0x0cd5, + 0x0000, 0x0cc6, 0x0cd6, 0x0000, 0x0cc6, 0x0cc2, 0x0000, 0x0cc6, + 0x0cc2, 0x0cd5, 0x0000, 0x0d46, 0x0d3e, 0x0000, 0x0d47, 0x0d3e, + 0x0000, 0x0d46, 0x0d57, 0x0000, 0x0dd9, 0x0dca, 0x0000, 0x0dd9, + 0x0dcf, 0x0000, 0x0dd9, 0x0dcf, 0x0dca, 0x0000, 0x0dd9, 0x0ddf, + 0x0000, 0x0e4d, 0x0e32, 0x0000, 0x0ecd, 0x0eb2, 0x0000, 0x0eab, + 0x0e99, 0x0000, 0x0eab, 0x0ea1, 0x0000, 0x0f0b, 0x0000, 0x0f42, + 0x0fb7, 0x0000, 0x0f4c, 0x0fb7, 0x0000, 0x0f51, 0x0fb7, 0x0000, + 0x0f56, 0x0fb7, 0x0000, 0x0f5b, 0x0fb7, 0x0000, 0x0f40, 0x0fb5, + 0x0000, 0x0f71, 0x0f72, 0x0000, 0x0f71, 0x0f74, 0x0000, 0x0fb2, + 0x0f80, 0x0000, 0x0fb2, 0x0f71, 0x0f80, 0x0000, 0x0fb3, 0x0f80, + 0x0000, 0x0fb3, 0x0f71, 0x0f80, 0x0000, 0x0f71, 0x0f80, 0x0000, + 0x0f92, 0x0fb7, 0x0000, 0x0f9c, 0x0fb7, 0x0000, 0x0fa1, 0x0fb7, + 0x0000, 0x0fa6, 0x0fb7, 0x0000, 0x0fab, 0x0fb7, 0x0000, 0x0f90, + 0x0fb5, 0x0000, 0x1025, 0x102e, 0x0000, 0x10dc, 0x0000, 0x1b05, + 0x1b35, 0x0000, 0x1b07, 0x1b35, 0x0000, 0x1b09, 0x1b35, 0x0000, + 0x1b0b, 0x1b35, 0x0000, 0x1b0d, 0x1b35, 0x0000, 0x1b11, 0x1b35, + 0x0000, 0x1b3a, 0x1b35, 0x0000, 0x1b3c, 0x1b35, 0x0000, 0x1b3e, + 0x1b35, 0x0000, 0x1b3f, 0x1b35, 0x0000, 0x1b42, 0x1b35, 0x0000, + 0x0041, 0x0000, 0x00c6, 0x0000, 0x0042, 0x0000, 0x0044, 0x0000, + 0x0045, 0x0000, 0x018e, 0x0000, 0x0047, 0x0000, 0x0048, 0x0000, + 0x0049, 0x0000, 0x004a, 0x0000, 0x004b, 0x0000, 0x004c, 0x0000, + 0x004d, 0x0000, 0x004e, 0x0000, 0x004f, 0x0000, 0x0222, 0x0000, + 0x0050, 0x0000, 0x0052, 0x0000, 0x0054, 0x0000, 0x0055, 0x0000, + 0x0057, 0x0000, 0x0250, 0x0000, 0x0251, 0x0000, 0x1d02, 0x0000, + 0x0062, 0x0000, 0x0064, 0x0000, 0x0065, 0x0000, 0x0259, 0x0000, + 0x025b, 0x0000, 0x025c, 0x0000, 0x0067, 0x0000, 0x006b, 0x0000, + 0x006d, 0x0000, 0x014b, 0x0000, 0x0254, 0x0000, 0x1d16, 0x0000, + 0x1d17, 0x0000, 0x0070, 0x0000, 0x0074, 0x0000, 0x0075, 0x0000, + 0x1d1d, 0x0000, 0x026f, 0x0000, 0x0076, 0x0000, 0x1d25, 0x0000, + 0x03b3, 0x0000, 0x03b4, 0x0000, 0x03c7, 0x0000, 0x0069, 0x0000, + 0x043d, 0x0000, 0x0252, 0x0000, 0x0063, 0x0000, 0x0255, 0x0000, + 0x00f0, 0x0000, 0x0066, 0x0000, 0x025f, 0x0000, 0x0261, 0x0000, + 0x0265, 0x0000, 0x0268, 0x0000, 0x0269, 0x0000, 0x026a, 0x0000, + 0x1d7b, 0x0000, 0x029d, 0x0000, 0x026d, 0x0000, 0x1d85, 0x0000, + 0x029f, 0x0000, 0x0271, 0x0000, 0x0270, 0x0000, 0x0272, 0x0000, + 0x0273, 0x0000, 0x0274, 0x0000, 0x0275, 0x0000, 0x0278, 0x0000, + 0x0282, 0x0000, 0x0283, 0x0000, 0x01ab, 0x0000, 0x0289, 0x0000, + 0x028a, 0x0000, 0x1d1c, 0x0000, 0x028b, 0x0000, 0x028c, 0x0000, + 0x007a, 0x0000, 0x0290, 0x0000, 0x0291, 0x0000, 0x0292, 0x0000, + 0x0041, 0x0325, 0x0000, 0x0061, 0x0325, 0x0000, 0x0042, 0x0307, + 0x0000, 0x0062, 0x0307, 0x0000, 0x0042, 0x0323, 0x0000, 0x0062, + 0x0323, 0x0000, 0x0042, 0x0331, 0x0000, 0x0062, 0x0331, 0x0000, + 0x0043, 0x0327, 0x0301, 0x0000, 0x0063, 0x0327, 0x0301, 0x0000, + 0x0044, 0x0307, 0x0000, 0x0064, 0x0307, 0x0000, 0x0044, 0x0323, + 0x0000, 0x0064, 0x0323, 0x0000, 0x0044, 0x0331, 0x0000, 0x0064, + 0x0331, 0x0000, 0x0044, 0x0327, 0x0000, 0x0064, 0x0327, 0x0000, + 0x0044, 0x032d, 0x0000, 0x0064, 0x032d, 0x0000, 0x0045, 0x0304, + 0x0300, 0x0000, 0x0065, 0x0304, 0x0300, 0x0000, 0x0045, 0x0304, + 0x0301, 0x0000, 0x0065, 0x0304, 0x0301, 0x0000, 0x0045, 0x032d, + 0x0000, 0x0065, 0x032d, 0x0000, 0x0045, 0x0330, 0x0000, 0x0065, + 0x0330, 0x0000, 0x0045, 0x0327, 0x0306, 0x0000, 0x0065, 0x0327, + 0x0306, 0x0000, 0x0046, 0x0307, 0x0000, 0x0066, 0x0307, 0x0000, + 0x0047, 0x0304, 0x0000, 0x0067, 0x0304, 0x0000, 0x0048, 0x0307, + 0x0000, 0x0068, 0x0307, 0x0000, 0x0048, 0x0323, 0x0000, 0x0068, + 0x0323, 0x0000, 0x0048, 0x0308, 0x0000, 0x0068, 0x0308, 0x0000, + 0x0048, 0x0327, 0x0000, 0x0068, 0x0327, 0x0000, 0x0048, 0x032e, + 0x0000, 0x0068, 0x032e, 0x0000, 0x0049, 0x0330, 0x0000, 0x0069, + 0x0330, 0x0000, 0x0049, 0x0308, 0x0301, 0x0000, 0x0069, 0x0308, + 0x0301, 0x0000, 0x004b, 0x0301, 0x0000, 0x006b, 0x0301, 0x0000, + 0x004b, 0x0323, 0x0000, 0x006b, 0x0323, 0x0000, 0x004b, 0x0331, + 0x0000, 0x006b, 0x0331, 0x0000, 0x004c, 0x0323, 0x0000, 0x006c, + 0x0323, 0x0000, 0x004c, 0x0323, 0x0304, 0x0000, 0x006c, 0x0323, + 0x0304, 0x0000, 0x004c, 0x0331, 0x0000, 0x006c, 0x0331, 0x0000, + 0x004c, 0x032d, 0x0000, 0x006c, 0x032d, 0x0000, 0x004d, 0x0301, + 0x0000, 0x006d, 0x0301, 0x0000, 0x004d, 0x0307, 0x0000, 0x006d, + 0x0307, 0x0000, 0x004d, 0x0323, 0x0000, 0x006d, 0x0323, 0x0000, + 0x004e, 0x0307, 0x0000, 0x006e, 0x0307, 0x0000, 0x004e, 0x0323, + 0x0000, 0x006e, 0x0323, 0x0000, 0x004e, 0x0331, 0x0000, 0x006e, + 0x0331, 0x0000, 0x004e, 0x032d, 0x0000, 0x006e, 0x032d, 0x0000, + 0x004f, 0x0303, 0x0301, 0x0000, 0x006f, 0x0303, 0x0301, 0x0000, + 0x004f, 0x0303, 0x0308, 0x0000, 0x006f, 0x0303, 0x0308, 0x0000, + 0x004f, 0x0304, 0x0300, 0x0000, 0x006f, 0x0304, 0x0300, 0x0000, + 0x004f, 0x0304, 0x0301, 0x0000, 0x006f, 0x0304, 0x0301, 0x0000, + 0x0050, 0x0301, 0x0000, 0x0070, 0x0301, 0x0000, 0x0050, 0x0307, + 0x0000, 0x0070, 0x0307, 0x0000, 0x0052, 0x0307, 0x0000, 0x0072, + 0x0307, 0x0000, 0x0052, 0x0323, 0x0000, 0x0072, 0x0323, 0x0000, + 0x0052, 0x0323, 0x0304, 0x0000, 0x0072, 0x0323, 0x0304, 0x0000, + 0x0052, 0x0331, 0x0000, 0x0072, 0x0331, 0x0000, 0x0053, 0x0307, + 0x0000, 0x0073, 0x0307, 0x0000, 0x0053, 0x0323, 0x0000, 0x0073, + 0x0323, 0x0000, 0x0053, 0x0301, 0x0307, 0x0000, 0x0073, 0x0301, + 0x0307, 0x0000, 0x0053, 0x030c, 0x0307, 0x0000, 0x0073, 0x030c, + 0x0307, 0x0000, 0x0053, 0x0323, 0x0307, 0x0000, 0x0073, 0x0323, + 0x0307, 0x0000, 0x0054, 0x0307, 0x0000, 0x0074, 0x0307, 0x0000, + 0x0054, 0x0323, 0x0000, 0x0074, 0x0323, 0x0000, 0x0054, 0x0331, + 0x0000, 0x0074, 0x0331, 0x0000, 0x0054, 0x032d, 0x0000, 0x0074, + 0x032d, 0x0000, 0x0055, 0x0324, 0x0000, 0x0075, 0x0324, 0x0000, + 0x0055, 0x0330, 0x0000, 0x0075, 0x0330, 0x0000, 0x0055, 0x032d, + 0x0000, 0x0075, 0x032d, 0x0000, 0x0055, 0x0303, 0x0301, 0x0000, + 0x0075, 0x0303, 0x0301, 0x0000, 0x0055, 0x0304, 0x0308, 0x0000, + 0x0075, 0x0304, 0x0308, 0x0000, 0x0056, 0x0303, 0x0000, 0x0076, + 0x0303, 0x0000, 0x0056, 0x0323, 0x0000, 0x0076, 0x0323, 0x0000, + 0x0057, 0x0300, 0x0000, 0x0077, 0x0300, 0x0000, 0x0057, 0x0301, + 0x0000, 0x0077, 0x0301, 0x0000, 0x0057, 0x0308, 0x0000, 0x0077, + 0x0308, 0x0000, 0x0057, 0x0307, 0x0000, 0x0077, 0x0307, 0x0000, + 0x0057, 0x0323, 0x0000, 0x0077, 0x0323, 0x0000, 0x0058, 0x0307, + 0x0000, 0x0078, 0x0307, 0x0000, 0x0058, 0x0308, 0x0000, 0x0078, + 0x0308, 0x0000, 0x0059, 0x0307, 0x0000, 0x0079, 0x0307, 0x0000, + 0x005a, 0x0302, 0x0000, 0x007a, 0x0302, 0x0000, 0x005a, 0x0323, + 0x0000, 0x007a, 0x0323, 0x0000, 0x005a, 0x0331, 0x0000, 0x007a, + 0x0331, 0x0000, 0x0068, 0x0331, 0x0000, 0x0074, 0x0308, 0x0000, + 0x0077, 0x030a, 0x0000, 0x0079, 0x030a, 0x0000, 0x0061, 0x02be, + 0x0000, 0x017f, 0x0307, 0x0000, 0x0041, 0x0323, 0x0000, 0x0061, + 0x0323, 0x0000, 0x0041, 0x0309, 0x0000, 0x0061, 0x0309, 0x0000, + 0x0041, 0x0302, 0x0301, 0x0000, 0x0061, 0x0302, 0x0301, 0x0000, + 0x0041, 0x0302, 0x0300, 0x0000, 0x0061, 0x0302, 0x0300, 0x0000, + 0x0041, 0x0302, 0x0309, 0x0000, 0x0061, 0x0302, 0x0309, 0x0000, + 0x0041, 0x0302, 0x0303, 0x0000, 0x0061, 0x0302, 0x0303, 0x0000, + 0x0041, 0x0323, 0x0302, 0x0000, 0x0061, 0x0323, 0x0302, 0x0000, + 0x0041, 0x0306, 0x0301, 0x0000, 0x0061, 0x0306, 0x0301, 0x0000, + 0x0041, 0x0306, 0x0300, 0x0000, 0x0061, 0x0306, 0x0300, 0x0000, + 0x0041, 0x0306, 0x0309, 0x0000, 0x0061, 0x0306, 0x0309, 0x0000, + 0x0041, 0x0306, 0x0303, 0x0000, 0x0061, 0x0306, 0x0303, 0x0000, + 0x0041, 0x0323, 0x0306, 0x0000, 0x0061, 0x0323, 0x0306, 0x0000, + 0x0045, 0x0323, 0x0000, 0x0065, 0x0323, 0x0000, 0x0045, 0x0309, + 0x0000, 0x0065, 0x0309, 0x0000, 0x0045, 0x0303, 0x0000, 0x0065, + 0x0303, 0x0000, 0x0045, 0x0302, 0x0301, 0x0000, 0x0065, 0x0302, + 0x0301, 0x0000, 0x0045, 0x0302, 0x0300, 0x0000, 0x0065, 0x0302, + 0x0300, 0x0000, 0x0045, 0x0302, 0x0309, 0x0000, 0x0065, 0x0302, + 0x0309, 0x0000, 0x0045, 0x0302, 0x0303, 0x0000, 0x0065, 0x0302, + 0x0303, 0x0000, 0x0045, 0x0323, 0x0302, 0x0000, 0x0065, 0x0323, + 0x0302, 0x0000, 0x0049, 0x0309, 0x0000, 0x0069, 0x0309, 0x0000, + 0x0049, 0x0323, 0x0000, 0x0069, 0x0323, 0x0000, 0x004f, 0x0323, + 0x0000, 0x006f, 0x0323, 0x0000, 0x004f, 0x0309, 0x0000, 0x006f, + 0x0309, 0x0000, 0x004f, 0x0302, 0x0301, 0x0000, 0x006f, 0x0302, + 0x0301, 0x0000, 0x004f, 0x0302, 0x0300, 0x0000, 0x006f, 0x0302, + 0x0300, 0x0000, 0x004f, 0x0302, 0x0309, 0x0000, 0x006f, 0x0302, + 0x0309, 0x0000, 0x004f, 0x0302, 0x0303, 0x0000, 0x006f, 0x0302, + 0x0303, 0x0000, 0x004f, 0x0323, 0x0302, 0x0000, 0x006f, 0x0323, + 0x0302, 0x0000, 0x004f, 0x031b, 0x0301, 0x0000, 0x006f, 0x031b, + 0x0301, 0x0000, 0x004f, 0x031b, 0x0300, 0x0000, 0x006f, 0x031b, + 0x0300, 0x0000, 0x004f, 0x031b, 0x0309, 0x0000, 0x006f, 0x031b, + 0x0309, 0x0000, 0x004f, 0x031b, 0x0303, 0x0000, 0x006f, 0x031b, + 0x0303, 0x0000, 0x004f, 0x031b, 0x0323, 0x0000, 0x006f, 0x031b, + 0x0323, 0x0000, 0x0055, 0x0323, 0x0000, 0x0075, 0x0323, 0x0000, + 0x0055, 0x0309, 0x0000, 0x0075, 0x0309, 0x0000, 0x0055, 0x031b, + 0x0301, 0x0000, 0x0075, 0x031b, 0x0301, 0x0000, 0x0055, 0x031b, + 0x0300, 0x0000, 0x0075, 0x031b, 0x0300, 0x0000, 0x0055, 0x031b, + 0x0309, 0x0000, 0x0075, 0x031b, 0x0309, 0x0000, 0x0055, 0x031b, + 0x0303, 0x0000, 0x0075, 0x031b, 0x0303, 0x0000, 0x0055, 0x031b, + 0x0323, 0x0000, 0x0075, 0x031b, 0x0323, 0x0000, 0x0059, 0x0300, + 0x0000, 0x0079, 0x0300, 0x0000, 0x0059, 0x0323, 0x0000, 0x0079, + 0x0323, 0x0000, 0x0059, 0x0309, 0x0000, 0x0079, 0x0309, 0x0000, + 0x0059, 0x0303, 0x0000, 0x0079, 0x0303, 0x0000, 0x03b1, 0x0313, + 0x0000, 0x03b1, 0x0314, 0x0000, 0x03b1, 0x0313, 0x0300, 0x0000, + 0x03b1, 0x0314, 0x0300, 0x0000, 0x03b1, 0x0313, 0x0301, 0x0000, + 0x03b1, 0x0314, 0x0301, 0x0000, 0x03b1, 0x0313, 0x0342, 0x0000, + 0x03b1, 0x0314, 0x0342, 0x0000, 0x0391, 0x0313, 0x0000, 0x0391, + 0x0314, 0x0000, 0x0391, 0x0313, 0x0300, 0x0000, 0x0391, 0x0314, + 0x0300, 0x0000, 0x0391, 0x0313, 0x0301, 0x0000, 0x0391, 0x0314, + 0x0301, 0x0000, 0x0391, 0x0313, 0x0342, 0x0000, 0x0391, 0x0314, + 0x0342, 0x0000, 0x03b5, 0x0313, 0x0000, 0x03b5, 0x0314, 0x0000, + 0x03b5, 0x0313, 0x0300, 0x0000, 0x03b5, 0x0314, 0x0300, 0x0000, + 0x03b5, 0x0313, 0x0301, 0x0000, 0x03b5, 0x0314, 0x0301, 0x0000, + 0x0395, 0x0313, 0x0000, 0x0395, 0x0314, 0x0000, 0x0395, 0x0313, + 0x0300, 0x0000, 0x0395, 0x0314, 0x0300, 0x0000, 0x0395, 0x0313, + 0x0301, 0x0000, 0x0395, 0x0314, 0x0301, 0x0000, 0x03b7, 0x0313, + 0x0000, 0x03b7, 0x0314, 0x0000, 0x03b7, 0x0313, 0x0300, 0x0000, + 0x03b7, 0x0314, 0x0300, 0x0000, 0x03b7, 0x0313, 0x0301, 0x0000, + 0x03b7, 0x0314, 0x0301, 0x0000, 0x03b7, 0x0313, 0x0342, 0x0000, + 0x03b7, 0x0314, 0x0342, 0x0000, 0x0397, 0x0313, 0x0000, 0x0397, + 0x0314, 0x0000, 0x0397, 0x0313, 0x0300, 0x0000, 0x0397, 0x0314, + 0x0300, 0x0000, 0x0397, 0x0313, 0x0301, 0x0000, 0x0397, 0x0314, + 0x0301, 0x0000, 0x0397, 0x0313, 0x0342, 0x0000, 0x0397, 0x0314, + 0x0342, 0x0000, 0x03b9, 0x0313, 0x0000, 0x03b9, 0x0314, 0x0000, + 0x03b9, 0x0313, 0x0300, 0x0000, 0x03b9, 0x0314, 0x0300, 0x0000, + 0x03b9, 0x0313, 0x0301, 0x0000, 0x03b9, 0x0314, 0x0301, 0x0000, + 0x03b9, 0x0313, 0x0342, 0x0000, 0x03b9, 0x0314, 0x0342, 0x0000, + 0x0399, 0x0313, 0x0000, 0x0399, 0x0314, 0x0000, 0x0399, 0x0313, + 0x0300, 0x0000, 0x0399, 0x0314, 0x0300, 0x0000, 0x0399, 0x0313, + 0x0301, 0x0000, 0x0399, 0x0314, 0x0301, 0x0000, 0x0399, 0x0313, + 0x0342, 0x0000, 0x0399, 0x0314, 0x0342, 0x0000, 0x03bf, 0x0313, + 0x0000, 0x03bf, 0x0314, 0x0000, 0x03bf, 0x0313, 0x0300, 0x0000, + 0x03bf, 0x0314, 0x0300, 0x0000, 0x03bf, 0x0313, 0x0301, 0x0000, + 0x03bf, 0x0314, 0x0301, 0x0000, 0x039f, 0x0313, 0x0000, 0x039f, + 0x0314, 0x0000, 0x039f, 0x0313, 0x0300, 0x0000, 0x039f, 0x0314, + 0x0300, 0x0000, 0x039f, 0x0313, 0x0301, 0x0000, 0x039f, 0x0314, + 0x0301, 0x0000, 0x03c5, 0x0313, 0x0000, 0x03c5, 0x0314, 0x0000, + 0x03c5, 0x0313, 0x0300, 0x0000, 0x03c5, 0x0314, 0x0300, 0x0000, + 0x03c5, 0x0313, 0x0301, 0x0000, 0x03c5, 0x0314, 0x0301, 0x0000, + 0x03c5, 0x0313, 0x0342, 0x0000, 0x03c5, 0x0314, 0x0342, 0x0000, + 0x03a5, 0x0314, 0x0000, 0x03a5, 0x0314, 0x0300, 0x0000, 0x03a5, + 0x0314, 0x0301, 0x0000, 0x03a5, 0x0314, 0x0342, 0x0000, 0x03c9, + 0x0313, 0x0000, 0x03c9, 0x0314, 0x0000, 0x03c9, 0x0313, 0x0300, + 0x0000, 0x03c9, 0x0314, 0x0300, 0x0000, 0x03c9, 0x0313, 0x0301, + 0x0000, 0x03c9, 0x0314, 0x0301, 0x0000, 0x03c9, 0x0313, 0x0342, + 0x0000, 0x03c9, 0x0314, 0x0342, 0x0000, 0x03a9, 0x0313, 0x0000, + 0x03a9, 0x0314, 0x0000, 0x03a9, 0x0313, 0x0300, 0x0000, 0x03a9, + 0x0314, 0x0300, 0x0000, 0x03a9, 0x0313, 0x0301, 0x0000, 0x03a9, + 0x0314, 0x0301, 0x0000, 0x03a9, 0x0313, 0x0342, 0x0000, 0x03a9, + 0x0314, 0x0342, 0x0000, 0x03b1, 0x0300, 0x0000, 0x03b5, 0x0300, + 0x0000, 0x03b7, 0x0300, 0x0000, 0x03b9, 0x0300, 0x0000, 0x03bf, + 0x0300, 0x0000, 0x03c5, 0x0300, 0x0000, 0x03c9, 0x0300, 0x0000, + 0x03b1, 0x0313, 0x0345, 0x0000, 0x03b1, 0x0314, 0x0345, 0x0000, + 0x03b1, 0x0313, 0x0300, 0x0345, 0x0000, 0x03b1, 0x0314, 0x0300, + 0x0345, 0x0000, 0x03b1, 0x0313, 0x0301, 0x0345, 0x0000, 0x03b1, + 0x0314, 0x0301, 0x0345, 0x0000, 0x03b1, 0x0313, 0x0342, 0x0345, + 0x0000, 0x03b1, 0x0314, 0x0342, 0x0345, 0x0000, 0x0391, 0x0313, + 0x0345, 0x0000, 0x0391, 0x0314, 0x0345, 0x0000, 0x0391, 0x0313, + 0x0300, 0x0345, 0x0000, 0x0391, 0x0314, 0x0300, 0x0345, 0x0000, + 0x0391, 0x0313, 0x0301, 0x0345, 0x0000, 0x0391, 0x0314, 0x0301, + 0x0345, 0x0000, 0x0391, 0x0313, 0x0342, 0x0345, 0x0000, 0x0391, + 0x0314, 0x0342, 0x0345, 0x0000, 0x03b7, 0x0313, 0x0345, 0x0000, + 0x03b7, 0x0314, 0x0345, 0x0000, 0x03b7, 0x0313, 0x0300, 0x0345, + 0x0000, 0x03b7, 0x0314, 0x0300, 0x0345, 0x0000, 0x03b7, 0x0313, + 0x0301, 0x0345, 0x0000, 0x03b7, 0x0314, 0x0301, 0x0345, 0x0000, + 0x03b7, 0x0313, 0x0342, 0x0345, 0x0000, 0x03b7, 0x0314, 0x0342, + 0x0345, 0x0000, 0x0397, 0x0313, 0x0345, 0x0000, 0x0397, 0x0314, + 0x0345, 0x0000, 0x0397, 0x0313, 0x0300, 0x0345, 0x0000, 0x0397, + 0x0314, 0x0300, 0x0345, 0x0000, 0x0397, 0x0313, 0x0301, 0x0345, + 0x0000, 0x0397, 0x0314, 0x0301, 0x0345, 0x0000, 0x0397, 0x0313, + 0x0342, 0x0345, 0x0000, 0x0397, 0x0314, 0x0342, 0x0345, 0x0000, + 0x03c9, 0x0313, 0x0345, 0x0000, 0x03c9, 0x0314, 0x0345, 0x0000, + 0x03c9, 0x0313, 0x0300, 0x0345, 0x0000, 0x03c9, 0x0314, 0x0300, + 0x0345, 0x0000, 0x03c9, 0x0313, 0x0301, 0x0345, 0x0000, 0x03c9, + 0x0314, 0x0301, 0x0345, 0x0000, 0x03c9, 0x0313, 0x0342, 0x0345, + 0x0000, 0x03c9, 0x0314, 0x0342, 0x0345, 0x0000, 0x03a9, 0x0313, + 0x0345, 0x0000, 0x03a9, 0x0314, 0x0345, 0x0000, 0x03a9, 0x0313, + 0x0300, 0x0345, 0x0000, 0x03a9, 0x0314, 0x0300, 0x0345, 0x0000, + 0x03a9, 0x0313, 0x0301, 0x0345, 0x0000, 0x03a9, 0x0314, 0x0301, + 0x0345, 0x0000, 0x03a9, 0x0313, 0x0342, 0x0345, 0x0000, 0x03a9, + 0x0314, 0x0342, 0x0345, 0x0000, 0x03b1, 0x0306, 0x0000, 0x03b1, + 0x0304, 0x0000, 0x03b1, 0x0300, 0x0345, 0x0000, 0x03b1, 0x0345, + 0x0000, 0x03b1, 0x0301, 0x0345, 0x0000, 0x03b1, 0x0342, 0x0000, + 0x03b1, 0x0342, 0x0345, 0x0000, 0x0391, 0x0306, 0x0000, 0x0391, + 0x0304, 0x0000, 0x0391, 0x0300, 0x0000, 0x0391, 0x0345, 0x0000, + 0x0020, 0x0313, 0x0000, 0x03b9, 0x0000, 0x0020, 0x0342, 0x0000, + 0x00a8, 0x0342, 0x0000, 0x0020, 0x0308, 0x0342, 0x0000, 0x03b7, + 0x0300, 0x0345, 0x0000, 0x03b7, 0x0345, 0x0000, 0x03b7, 0x0301, + 0x0345, 0x0000, 0x03b7, 0x0342, 0x0000, 0x03b7, 0x0342, 0x0345, + 0x0000, 0x0395, 0x0300, 0x0000, 0x0397, 0x0300, 0x0000, 0x0397, + 0x0345, 0x0000, 0x1fbf, 0x0300, 0x0000, 0x0020, 0x0313, 0x0300, + 0x0000, 0x1fbf, 0x0301, 0x0000, 0x0020, 0x0313, 0x0301, 0x0000, + 0x1fbf, 0x0342, 0x0000, 0x0020, 0x0313, 0x0342, 0x0000, 0x03b9, + 0x0306, 0x0000, 0x03b9, 0x0304, 0x0000, 0x03b9, 0x0308, 0x0300, + 0x0000, 0x03b9, 0x0342, 0x0000, 0x03b9, 0x0308, 0x0342, 0x0000, + 0x0399, 0x0306, 0x0000, 0x0399, 0x0304, 0x0000, 0x0399, 0x0300, + 0x0000, 0x1ffe, 0x0300, 0x0000, 0x0020, 0x0314, 0x0300, 0x0000, + 0x1ffe, 0x0301, 0x0000, 0x0020, 0x0314, 0x0301, 0x0000, 0x1ffe, + 0x0342, 0x0000, 0x0020, 0x0314, 0x0342, 0x0000, 0x03c5, 0x0306, + 0x0000, 0x03c5, 0x0304, 0x0000, 0x03c5, 0x0308, 0x0300, 0x0000, + 0x03c1, 0x0313, 0x0000, 0x03c1, 0x0314, 0x0000, 0x03c5, 0x0342, + 0x0000, 0x03c5, 0x0308, 0x0342, 0x0000, 0x03a5, 0x0306, 0x0000, + 0x03a5, 0x0304, 0x0000, 0x03a5, 0x0300, 0x0000, 0x03a1, 0x0314, + 0x0000, 0x00a8, 0x0300, 0x0000, 0x0020, 0x0308, 0x0300, 0x0000, + 0x0060, 0x0000, 0x03c9, 0x0300, 0x0345, 0x0000, 0x03c9, 0x0345, + 0x0000, 0x03c9, 0x0301, 0x0345, 0x0000, 0x03c9, 0x0342, 0x0000, + 0x03c9, 0x0342, 0x0345, 0x0000, 0x039f, 0x0300, 0x0000, 0x03a9, + 0x0300, 0x0000, 0x03a9, 0x0345, 0x0000, 0x00b4, 0x0000, 0x0020, + 0x0314, 0x0000, 0x2002, 0x0000, 0x2003, 0x0000, 0x2010, 0x0000, + 0x0020, 0x0333, 0x0000, 0x002e, 0x0000, 0x002e, 0x002e, 0x0000, + 0x002e, 0x002e, 0x002e, 0x0000, 0x2032, 0x2032, 0x0000, 0x2032, + 0x2032, 0x2032, 0x0000, 0x2035, 0x2035, 0x0000, 0x2035, 0x2035, + 0x2035, 0x0000, 0x0021, 0x0021, 0x0000, 0x0020, 0x0305, 0x0000, + 0x003f, 0x003f, 0x0000, 0x003f, 0x0021, 0x0000, 0x0021, 0x003f, + 0x0000, 0x2032, 0x2032, 0x2032, 0x2032, 0x0000, 0x0030, 0x0000, + 0x0034, 0x0000, 0x0035, 0x0000, 0x0036, 0x0000, 0x0037, 0x0000, + 0x0038, 0x0000, 0x0039, 0x0000, 0x002b, 0x0000, 0x2212, 0x0000, + 0x003d, 0x0000, 0x0028, 0x0000, 0x0029, 0x0000, 0x006e, 0x0000, + 0x0052, 0x0073, 0x0000, 0x0061, 0x002f, 0x0063, 0x0000, 0x0061, + 0x002f, 0x0073, 0x0000, 0x0043, 0x0000, 0x00b0, 0x0043, 0x0000, + 0x0063, 0x002f, 0x006f, 0x0000, 0x0063, 0x002f, 0x0075, 0x0000, + 0x0190, 0x0000, 0x00b0, 0x0046, 0x0000, 0x0127, 0x0000, 0x004e, + 0x006f, 0x0000, 0x0051, 0x0000, 0x0053, 0x004d, 0x0000, 0x0054, + 0x0045, 0x004c, 0x0000, 0x0054, 0x004d, 0x0000, 0x005a, 0x0000, + 0x03a9, 0x0000, 0x0046, 0x0000, 0x05d0, 0x0000, 0x05d1, 0x0000, + 0x05d2, 0x0000, 0x05d3, 0x0000, 0x0046, 0x0041, 0x0058, 0x0000, + 0x0393, 0x0000, 0x03a0, 0x0000, 0x2211, 0x0000, 0x0031, 0x2044, + 0x0037, 0x0000, 0x0031, 0x2044, 0x0039, 0x0000, 0x0031, 0x2044, + 0x0031, 0x0030, 0x0000, 0x0031, 0x2044, 0x0033, 0x0000, 0x0032, + 0x2044, 0x0033, 0x0000, 0x0031, 0x2044, 0x0035, 0x0000, 0x0032, + 0x2044, 0x0035, 0x0000, 0x0033, 0x2044, 0x0035, 0x0000, 0x0034, + 0x2044, 0x0035, 0x0000, 0x0031, 0x2044, 0x0036, 0x0000, 0x0035, + 0x2044, 0x0036, 0x0000, 0x0031, 0x2044, 0x0038, 0x0000, 0x0033, + 0x2044, 0x0038, 0x0000, 0x0035, 0x2044, 0x0038, 0x0000, 0x0037, + 0x2044, 0x0038, 0x0000, 0x0031, 0x2044, 0x0000, 0x0049, 0x0049, + 0x0000, 0x0049, 0x0049, 0x0049, 0x0000, 0x0049, 0x0056, 0x0000, + 0x0056, 0x0000, 0x0056, 0x0049, 0x0000, 0x0056, 0x0049, 0x0049, + 0x0000, 0x0056, 0x0049, 0x0049, 0x0049, 0x0000, 0x0049, 0x0058, + 0x0000, 0x0058, 0x0000, 0x0058, 0x0049, 0x0000, 0x0058, 0x0049, + 0x0049, 0x0000, 0x0069, 0x0069, 0x0000, 0x0069, 0x0069, 0x0069, + 0x0000, 0x0069, 0x0076, 0x0000, 0x0076, 0x0069, 0x0000, 0x0076, + 0x0069, 0x0069, 0x0000, 0x0076, 0x0069, 0x0069, 0x0069, 0x0000, + 0x0069, 0x0078, 0x0000, 0x0078, 0x0069, 0x0000, 0x0078, 0x0069, + 0x0069, 0x0000, 0x0030, 0x2044, 0x0033, 0x0000, 0x2190, 0x0338, + 0x0000, 0x2192, 0x0338, 0x0000, 0x2194, 0x0338, 0x0000, 0x21d0, + 0x0338, 0x0000, 0x21d4, 0x0338, 0x0000, 0x21d2, 0x0338, 0x0000, + 0x2203, 0x0338, 0x0000, 0x2208, 0x0338, 0x0000, 0x220b, 0x0338, + 0x0000, 0x2223, 0x0338, 0x0000, 0x2225, 0x0338, 0x0000, 0x222b, + 0x222b, 0x0000, 0x222b, 0x222b, 0x222b, 0x0000, 0x222e, 0x222e, + 0x0000, 0x222e, 0x222e, 0x222e, 0x0000, 0x223c, 0x0338, 0x0000, + 0x2243, 0x0338, 0x0000, 0x2245, 0x0338, 0x0000, 0x2248, 0x0338, + 0x0000, 0x003d, 0x0338, 0x0000, 0x2261, 0x0338, 0x0000, 0x224d, + 0x0338, 0x0000, 0x003c, 0x0338, 0x0000, 0x003e, 0x0338, 0x0000, + 0x2264, 0x0338, 0x0000, 0x2265, 0x0338, 0x0000, 0x2272, 0x0338, + 0x0000, 0x2273, 0x0338, 0x0000, 0x2276, 0x0338, 0x0000, 0x2277, + 0x0338, 0x0000, 0x227a, 0x0338, 0x0000, 0x227b, 0x0338, 0x0000, + 0x2282, 0x0338, 0x0000, 0x2283, 0x0338, 0x0000, 0x2286, 0x0338, + 0x0000, 0x2287, 0x0338, 0x0000, 0x22a2, 0x0338, 0x0000, 0x22a8, + 0x0338, 0x0000, 0x22a9, 0x0338, 0x0000, 0x22ab, 0x0338, 0x0000, + 0x227c, 0x0338, 0x0000, 0x227d, 0x0338, 0x0000, 0x2291, 0x0338, + 0x0000, 0x2292, 0x0338, 0x0000, 0x22b2, 0x0338, 0x0000, 0x22b3, + 0x0338, 0x0000, 0x22b4, 0x0338, 0x0000, 0x22b5, 0x0338, 0x0000, + 0x3008, 0x0000, 0x3009, 0x0000, 0x0031, 0x0030, 0x0000, 0x0031, + 0x0031, 0x0000, 0x0031, 0x0032, 0x0000, 0x0031, 0x0033, 0x0000, + 0x0031, 0x0034, 0x0000, 0x0031, 0x0035, 0x0000, 0x0031, 0x0036, + 0x0000, 0x0031, 0x0037, 0x0000, 0x0031, 0x0038, 0x0000, 0x0031, + 0x0039, 0x0000, 0x0032, 0x0030, 0x0000, 0x0028, 0x0031, 0x0029, + 0x0000, 0x0028, 0x0032, 0x0029, 0x0000, 0x0028, 0x0033, 0x0029, + 0x0000, 0x0028, 0x0034, 0x0029, 0x0000, 0x0028, 0x0035, 0x0029, + 0x0000, 0x0028, 0x0036, 0x0029, 0x0000, 0x0028, 0x0037, 0x0029, + 0x0000, 0x0028, 0x0038, 0x0029, 0x0000, 0x0028, 0x0039, 0x0029, + 0x0000, 0x0028, 0x0031, 0x0030, 0x0029, 0x0000, 0x0028, 0x0031, + 0x0031, 0x0029, 0x0000, 0x0028, 0x0031, 0x0032, 0x0029, 0x0000, + 0x0028, 0x0031, 0x0033, 0x0029, 0x0000, 0x0028, 0x0031, 0x0034, + 0x0029, 0x0000, 0x0028, 0x0031, 0x0035, 0x0029, 0x0000, 0x0028, + 0x0031, 0x0036, 0x0029, 0x0000, 0x0028, 0x0031, 0x0037, 0x0029, + 0x0000, 0x0028, 0x0031, 0x0038, 0x0029, 0x0000, 0x0028, 0x0031, + 0x0039, 0x0029, 0x0000, 0x0028, 0x0032, 0x0030, 0x0029, 0x0000, + 0x0031, 0x002e, 0x0000, 0x0032, 0x002e, 0x0000, 0x0033, 0x002e, + 0x0000, 0x0034, 0x002e, 0x0000, 0x0035, 0x002e, 0x0000, 0x0036, + 0x002e, 0x0000, 0x0037, 0x002e, 0x0000, 0x0038, 0x002e, 0x0000, + 0x0039, 0x002e, 0x0000, 0x0031, 0x0030, 0x002e, 0x0000, 0x0031, + 0x0031, 0x002e, 0x0000, 0x0031, 0x0032, 0x002e, 0x0000, 0x0031, + 0x0033, 0x002e, 0x0000, 0x0031, 0x0034, 0x002e, 0x0000, 0x0031, + 0x0035, 0x002e, 0x0000, 0x0031, 0x0036, 0x002e, 0x0000, 0x0031, + 0x0037, 0x002e, 0x0000, 0x0031, 0x0038, 0x002e, 0x0000, 0x0031, + 0x0039, 0x002e, 0x0000, 0x0032, 0x0030, 0x002e, 0x0000, 0x0028, + 0x0061, 0x0029, 0x0000, 0x0028, 0x0062, 0x0029, 0x0000, 0x0028, + 0x0063, 0x0029, 0x0000, 0x0028, 0x0064, 0x0029, 0x0000, 0x0028, + 0x0065, 0x0029, 0x0000, 0x0028, 0x0066, 0x0029, 0x0000, 0x0028, + 0x0067, 0x0029, 0x0000, 0x0028, 0x0068, 0x0029, 0x0000, 0x0028, + 0x0069, 0x0029, 0x0000, 0x0028, 0x006a, 0x0029, 0x0000, 0x0028, + 0x006b, 0x0029, 0x0000, 0x0028, 0x006c, 0x0029, 0x0000, 0x0028, + 0x006d, 0x0029, 0x0000, 0x0028, 0x006e, 0x0029, 0x0000, 0x0028, + 0x006f, 0x0029, 0x0000, 0x0028, 0x0070, 0x0029, 0x0000, 0x0028, + 0x0071, 0x0029, 0x0000, 0x0028, 0x0072, 0x0029, 0x0000, 0x0028, + 0x0073, 0x0029, 0x0000, 0x0028, 0x0074, 0x0029, 0x0000, 0x0028, + 0x0075, 0x0029, 0x0000, 0x0028, 0x0076, 0x0029, 0x0000, 0x0028, + 0x0077, 0x0029, 0x0000, 0x0028, 0x0078, 0x0029, 0x0000, 0x0028, + 0x0079, 0x0029, 0x0000, 0x0028, 0x007a, 0x0029, 0x0000, 0x0053, + 0x0000, 0x0059, 0x0000, 0x0071, 0x0000, 0x222b, 0x222b, 0x222b, + 0x222b, 0x0000, 0x003a, 0x003a, 0x003d, 0x0000, 0x003d, 0x003d, + 0x0000, 0x003d, 0x003d, 0x003d, 0x0000, 0x2add, 0x0338, 0x0000, + 0x2d61, 0x0000, 0x6bcd, 0x0000, 0x9f9f, 0x0000, 0x4e00, 0x0000, + 0x4e28, 0x0000, 0x4e36, 0x0000, 0x4e3f, 0x0000, 0x4e59, 0x0000, + 0x4e85, 0x0000, 0x4e8c, 0x0000, 0x4ea0, 0x0000, 0x4eba, 0x0000, + 0x513f, 0x0000, 0x5165, 0x0000, 0x516b, 0x0000, 0x5182, 0x0000, + 0x5196, 0x0000, 0x51ab, 0x0000, 0x51e0, 0x0000, 0x51f5, 0x0000, + 0x5200, 0x0000, 0x529b, 0x0000, 0x52f9, 0x0000, 0x5315, 0x0000, + 0x531a, 0x0000, 0x5338, 0x0000, 0x5341, 0x0000, 0x535c, 0x0000, + 0x5369, 0x0000, 0x5382, 0x0000, 0x53b6, 0x0000, 0x53c8, 0x0000, + 0x53e3, 0x0000, 0x56d7, 0x0000, 0x571f, 0x0000, 0x58eb, 0x0000, + 0x5902, 0x0000, 0x590a, 0x0000, 0x5915, 0x0000, 0x5927, 0x0000, + 0x5973, 0x0000, 0x5b50, 0x0000, 0x5b80, 0x0000, 0x5bf8, 0x0000, + 0x5c0f, 0x0000, 0x5c22, 0x0000, 0x5c38, 0x0000, 0x5c6e, 0x0000, + 0x5c71, 0x0000, 0x5ddb, 0x0000, 0x5de5, 0x0000, 0x5df1, 0x0000, + 0x5dfe, 0x0000, 0x5e72, 0x0000, 0x5e7a, 0x0000, 0x5e7f, 0x0000, + 0x5ef4, 0x0000, 0x5efe, 0x0000, 0x5f0b, 0x0000, 0x5f13, 0x0000, + 0x5f50, 0x0000, 0x5f61, 0x0000, 0x5f73, 0x0000, 0x5fc3, 0x0000, + 0x6208, 0x0000, 0x6236, 0x0000, 0x624b, 0x0000, 0x652f, 0x0000, + 0x6534, 0x0000, 0x6587, 0x0000, 0x6597, 0x0000, 0x65a4, 0x0000, + 0x65b9, 0x0000, 0x65e0, 0x0000, 0x65e5, 0x0000, 0x66f0, 0x0000, + 0x6708, 0x0000, 0x6728, 0x0000, 0x6b20, 0x0000, 0x6b62, 0x0000, + 0x6b79, 0x0000, 0x6bb3, 0x0000, 0x6bcb, 0x0000, 0x6bd4, 0x0000, + 0x6bdb, 0x0000, 0x6c0f, 0x0000, 0x6c14, 0x0000, 0x6c34, 0x0000, + 0x706b, 0x0000, 0x722a, 0x0000, 0x7236, 0x0000, 0x723b, 0x0000, + 0x723f, 0x0000, 0x7247, 0x0000, 0x7259, 0x0000, 0x725b, 0x0000, + 0x72ac, 0x0000, 0x7384, 0x0000, 0x7389, 0x0000, 0x74dc, 0x0000, + 0x74e6, 0x0000, 0x7518, 0x0000, 0x751f, 0x0000, 0x7528, 0x0000, + 0x7530, 0x0000, 0x758b, 0x0000, 0x7592, 0x0000, 0x7676, 0x0000, + 0x767d, 0x0000, 0x76ae, 0x0000, 0x76bf, 0x0000, 0x76ee, 0x0000, + 0x77db, 0x0000, 0x77e2, 0x0000, 0x77f3, 0x0000, 0x793a, 0x0000, + 0x79b8, 0x0000, 0x79be, 0x0000, 0x7a74, 0x0000, 0x7acb, 0x0000, + 0x7af9, 0x0000, 0x7c73, 0x0000, 0x7cf8, 0x0000, 0x7f36, 0x0000, + 0x7f51, 0x0000, 0x7f8a, 0x0000, 0x7fbd, 0x0000, 0x8001, 0x0000, + 0x800c, 0x0000, 0x8012, 0x0000, 0x8033, 0x0000, 0x807f, 0x0000, + 0x8089, 0x0000, 0x81e3, 0x0000, 0x81ea, 0x0000, 0x81f3, 0x0000, + 0x81fc, 0x0000, 0x820c, 0x0000, 0x821b, 0x0000, 0x821f, 0x0000, + 0x826e, 0x0000, 0x8272, 0x0000, 0x8278, 0x0000, 0x864d, 0x0000, + 0x866b, 0x0000, 0x8840, 0x0000, 0x884c, 0x0000, 0x8863, 0x0000, + 0x897e, 0x0000, 0x898b, 0x0000, 0x89d2, 0x0000, 0x8a00, 0x0000, + 0x8c37, 0x0000, 0x8c46, 0x0000, 0x8c55, 0x0000, 0x8c78, 0x0000, + 0x8c9d, 0x0000, 0x8d64, 0x0000, 0x8d70, 0x0000, 0x8db3, 0x0000, + 0x8eab, 0x0000, 0x8eca, 0x0000, 0x8f9b, 0x0000, 0x8fb0, 0x0000, + 0x8fb5, 0x0000, 0x9091, 0x0000, 0x9149, 0x0000, 0x91c6, 0x0000, + 0x91cc, 0x0000, 0x91d1, 0x0000, 0x9577, 0x0000, 0x9580, 0x0000, + 0x961c, 0x0000, 0x96b6, 0x0000, 0x96b9, 0x0000, 0x96e8, 0x0000, + 0x9751, 0x0000, 0x975e, 0x0000, 0x9762, 0x0000, 0x9769, 0x0000, + 0x97cb, 0x0000, 0x97ed, 0x0000, 0x97f3, 0x0000, 0x9801, 0x0000, + 0x98a8, 0x0000, 0x98db, 0x0000, 0x98df, 0x0000, 0x9996, 0x0000, + 0x9999, 0x0000, 0x99ac, 0x0000, 0x9aa8, 0x0000, 0x9ad8, 0x0000, + 0x9adf, 0x0000, 0x9b25, 0x0000, 0x9b2f, 0x0000, 0x9b32, 0x0000, + 0x9b3c, 0x0000, 0x9b5a, 0x0000, 0x9ce5, 0x0000, 0x9e75, 0x0000, + 0x9e7f, 0x0000, 0x9ea5, 0x0000, 0x9ebb, 0x0000, 0x9ec3, 0x0000, + 0x9ecd, 0x0000, 0x9ed1, 0x0000, 0x9ef9, 0x0000, 0x9efd, 0x0000, + 0x9f0e, 0x0000, 0x9f13, 0x0000, 0x9f20, 0x0000, 0x9f3b, 0x0000, + 0x9f4a, 0x0000, 0x9f52, 0x0000, 0x9f8d, 0x0000, 0x9f9c, 0x0000, + 0x9fa0, 0x0000, 0x3012, 0x0000, 0x5344, 0x0000, 0x5345, 0x0000, + 0x304b, 0x3099, 0x0000, 0x304d, 0x3099, 0x0000, 0x304f, 0x3099, + 0x0000, 0x3051, 0x3099, 0x0000, 0x3053, 0x3099, 0x0000, 0x3055, + 0x3099, 0x0000, 0x3057, 0x3099, 0x0000, 0x3059, 0x3099, 0x0000, + 0x305b, 0x3099, 0x0000, 0x305d, 0x3099, 0x0000, 0x305f, 0x3099, + 0x0000, 0x3061, 0x3099, 0x0000, 0x3064, 0x3099, 0x0000, 0x3066, + 0x3099, 0x0000, 0x3068, 0x3099, 0x0000, 0x306f, 0x3099, 0x0000, + 0x306f, 0x309a, 0x0000, 0x3072, 0x3099, 0x0000, 0x3072, 0x309a, + 0x0000, 0x3075, 0x3099, 0x0000, 0x3075, 0x309a, 0x0000, 0x3078, + 0x3099, 0x0000, 0x3078, 0x309a, 0x0000, 0x307b, 0x3099, 0x0000, + 0x307b, 0x309a, 0x0000, 0x3046, 0x3099, 0x0000, 0x0020, 0x3099, + 0x0000, 0x0020, 0x309a, 0x0000, 0x309d, 0x3099, 0x0000, 0x3088, + 0x308a, 0x0000, 0x30ab, 0x3099, 0x0000, 0x30ad, 0x3099, 0x0000, + 0x30af, 0x3099, 0x0000, 0x30b1, 0x3099, 0x0000, 0x30b3, 0x3099, + 0x0000, 0x30b5, 0x3099, 0x0000, 0x30b7, 0x3099, 0x0000, 0x30b9, + 0x3099, 0x0000, 0x30bb, 0x3099, 0x0000, 0x30bd, 0x3099, 0x0000, + 0x30bf, 0x3099, 0x0000, 0x30c1, 0x3099, 0x0000, 0x30c4, 0x3099, + 0x0000, 0x30c6, 0x3099, 0x0000, 0x30c8, 0x3099, 0x0000, 0x30cf, + 0x3099, 0x0000, 0x30cf, 0x309a, 0x0000, 0x30d2, 0x3099, 0x0000, + 0x30d2, 0x309a, 0x0000, 0x30d5, 0x3099, 0x0000, 0x30d5, 0x309a, + 0x0000, 0x30d8, 0x3099, 0x0000, 0x30d8, 0x309a, 0x0000, 0x30db, + 0x3099, 0x0000, 0x30db, 0x309a, 0x0000, 0x30a6, 0x3099, 0x0000, + 0x30ef, 0x3099, 0x0000, 0x30f0, 0x3099, 0x0000, 0x30f1, 0x3099, + 0x0000, 0x30f2, 0x3099, 0x0000, 0x30fd, 0x3099, 0x0000, 0x30b3, + 0x30c8, 0x0000, 0x1100, 0x0000, 0x1101, 0x0000, 0x11aa, 0x0000, + 0x1102, 0x0000, 0x11ac, 0x0000, 0x11ad, 0x0000, 0x1103, 0x0000, + 0x1104, 0x0000, 0x1105, 0x0000, 0x11b0, 0x0000, 0x11b1, 0x0000, + 0x11b2, 0x0000, 0x11b3, 0x0000, 0x11b4, 0x0000, 0x11b5, 0x0000, + 0x111a, 0x0000, 0x1106, 0x0000, 0x1107, 0x0000, 0x1108, 0x0000, + 0x1121, 0x0000, 0x1109, 0x0000, 0x110a, 0x0000, 0x110b, 0x0000, + 0x110c, 0x0000, 0x110d, 0x0000, 0x110e, 0x0000, 0x110f, 0x0000, + 0x1110, 0x0000, 0x1111, 0x0000, 0x1112, 0x0000, 0x1161, 0x0000, + 0x1162, 0x0000, 0x1163, 0x0000, 0x1164, 0x0000, 0x1165, 0x0000, + 0x1166, 0x0000, 0x1167, 0x0000, 0x1168, 0x0000, 0x1169, 0x0000, + 0x116a, 0x0000, 0x116b, 0x0000, 0x116c, 0x0000, 0x116d, 0x0000, + 0x116e, 0x0000, 0x116f, 0x0000, 0x1170, 0x0000, 0x1171, 0x0000, + 0x1172, 0x0000, 0x1173, 0x0000, 0x1174, 0x0000, 0x1175, 0x0000, + 0x1160, 0x0000, 0x1114, 0x0000, 0x1115, 0x0000, 0x11c7, 0x0000, + 0x11c8, 0x0000, 0x11cc, 0x0000, 0x11ce, 0x0000, 0x11d3, 0x0000, + 0x11d7, 0x0000, 0x11d9, 0x0000, 0x111c, 0x0000, 0x11dd, 0x0000, + 0x11df, 0x0000, 0x111d, 0x0000, 0x111e, 0x0000, 0x1120, 0x0000, + 0x1122, 0x0000, 0x1123, 0x0000, 0x1127, 0x0000, 0x1129, 0x0000, + 0x112b, 0x0000, 0x112c, 0x0000, 0x112d, 0x0000, 0x112e, 0x0000, + 0x112f, 0x0000, 0x1132, 0x0000, 0x1136, 0x0000, 0x1140, 0x0000, + 0x1147, 0x0000, 0x114c, 0x0000, 0x11f1, 0x0000, 0x11f2, 0x0000, + 0x1157, 0x0000, 0x1158, 0x0000, 0x1159, 0x0000, 0x1184, 0x0000, + 0x1185, 0x0000, 0x1188, 0x0000, 0x1191, 0x0000, 0x1192, 0x0000, + 0x1194, 0x0000, 0x119e, 0x0000, 0x11a1, 0x0000, 0x4e09, 0x0000, + 0x56db, 0x0000, 0x4e0a, 0x0000, 0x4e2d, 0x0000, 0x4e0b, 0x0000, + 0x7532, 0x0000, 0x4e19, 0x0000, 0x4e01, 0x0000, 0x5929, 0x0000, + 0x5730, 0x0000, 0x0028, 0x1100, 0x0029, 0x0000, 0x0028, 0x1102, + 0x0029, 0x0000, 0x0028, 0x1103, 0x0029, 0x0000, 0x0028, 0x1105, + 0x0029, 0x0000, 0x0028, 0x1106, 0x0029, 0x0000, 0x0028, 0x1107, + 0x0029, 0x0000, 0x0028, 0x1109, 0x0029, 0x0000, 0x0028, 0x110b, + 0x0029, 0x0000, 0x0028, 0x110c, 0x0029, 0x0000, 0x0028, 0x110e, + 0x0029, 0x0000, 0x0028, 0x110f, 0x0029, 0x0000, 0x0028, 0x1110, + 0x0029, 0x0000, 0x0028, 0x1111, 0x0029, 0x0000, 0x0028, 0x1112, + 0x0029, 0x0000, 0x0028, 0x1100, 0x1161, 0x0029, 0x0000, 0x0028, + 0x1102, 0x1161, 0x0029, 0x0000, 0x0028, 0x1103, 0x1161, 0x0029, + 0x0000, 0x0028, 0x1105, 0x1161, 0x0029, 0x0000, 0x0028, 0x1106, + 0x1161, 0x0029, 0x0000, 0x0028, 0x1107, 0x1161, 0x0029, 0x0000, + 0x0028, 0x1109, 0x1161, 0x0029, 0x0000, 0x0028, 0x110b, 0x1161, + 0x0029, 0x0000, 0x0028, 0x110c, 0x1161, 0x0029, 0x0000, 0x0028, + 0x110e, 0x1161, 0x0029, 0x0000, 0x0028, 0x110f, 0x1161, 0x0029, + 0x0000, 0x0028, 0x1110, 0x1161, 0x0029, 0x0000, 0x0028, 0x1111, + 0x1161, 0x0029, 0x0000, 0x0028, 0x1112, 0x1161, 0x0029, 0x0000, + 0x0028, 0x110c, 0x116e, 0x0029, 0x0000, 0x0028, 0x110b, 0x1169, + 0x110c, 0x1165, 0x11ab, 0x0029, 0x0000, 0x0028, 0x110b, 0x1169, + 0x1112, 0x116e, 0x0029, 0x0000, 0x0028, 0x4e00, 0x0029, 0x0000, + 0x0028, 0x4e8c, 0x0029, 0x0000, 0x0028, 0x4e09, 0x0029, 0x0000, + 0x0028, 0x56db, 0x0029, 0x0000, 0x0028, 0x4e94, 0x0029, 0x0000, + 0x0028, 0x516d, 0x0029, 0x0000, 0x0028, 0x4e03, 0x0029, 0x0000, + 0x0028, 0x516b, 0x0029, 0x0000, 0x0028, 0x4e5d, 0x0029, 0x0000, + 0x0028, 0x5341, 0x0029, 0x0000, 0x0028, 0x6708, 0x0029, 0x0000, + 0x0028, 0x706b, 0x0029, 0x0000, 0x0028, 0x6c34, 0x0029, 0x0000, + 0x0028, 0x6728, 0x0029, 0x0000, 0x0028, 0x91d1, 0x0029, 0x0000, + 0x0028, 0x571f, 0x0029, 0x0000, 0x0028, 0x65e5, 0x0029, 0x0000, + 0x0028, 0x682a, 0x0029, 0x0000, 0x0028, 0x6709, 0x0029, 0x0000, + 0x0028, 0x793e, 0x0029, 0x0000, 0x0028, 0x540d, 0x0029, 0x0000, + 0x0028, 0x7279, 0x0029, 0x0000, 0x0028, 0x8ca1, 0x0029, 0x0000, + 0x0028, 0x795d, 0x0029, 0x0000, 0x0028, 0x52b4, 0x0029, 0x0000, + 0x0028, 0x4ee3, 0x0029, 0x0000, 0x0028, 0x547c, 0x0029, 0x0000, + 0x0028, 0x5b66, 0x0029, 0x0000, 0x0028, 0x76e3, 0x0029, 0x0000, + 0x0028, 0x4f01, 0x0029, 0x0000, 0x0028, 0x8cc7, 0x0029, 0x0000, + 0x0028, 0x5354, 0x0029, 0x0000, 0x0028, 0x796d, 0x0029, 0x0000, + 0x0028, 0x4f11, 0x0029, 0x0000, 0x0028, 0x81ea, 0x0029, 0x0000, + 0x0028, 0x81f3, 0x0029, 0x0000, 0x554f, 0x0000, 0x5e7c, 0x0000, + 0x7b8f, 0x0000, 0x0050, 0x0054, 0x0045, 0x0000, 0x0032, 0x0031, + 0x0000, 0x0032, 0x0032, 0x0000, 0x0032, 0x0033, 0x0000, 0x0032, + 0x0034, 0x0000, 0x0032, 0x0035, 0x0000, 0x0032, 0x0036, 0x0000, + 0x0032, 0x0037, 0x0000, 0x0032, 0x0038, 0x0000, 0x0032, 0x0039, + 0x0000, 0x0033, 0x0030, 0x0000, 0x0033, 0x0031, 0x0000, 0x0033, + 0x0032, 0x0000, 0x0033, 0x0033, 0x0000, 0x0033, 0x0034, 0x0000, + 0x0033, 0x0035, 0x0000, 0x1100, 0x1161, 0x0000, 0x1102, 0x1161, + 0x0000, 0x1103, 0x1161, 0x0000, 0x1105, 0x1161, 0x0000, 0x1106, + 0x1161, 0x0000, 0x1107, 0x1161, 0x0000, 0x1109, 0x1161, 0x0000, + 0x110b, 0x1161, 0x0000, 0x110c, 0x1161, 0x0000, 0x110e, 0x1161, + 0x0000, 0x110f, 0x1161, 0x0000, 0x1110, 0x1161, 0x0000, 0x1111, + 0x1161, 0x0000, 0x1112, 0x1161, 0x0000, 0x110e, 0x1161, 0x11b7, + 0x1100, 0x1169, 0x0000, 0x110c, 0x116e, 0x110b, 0x1174, 0x0000, + 0x110b, 0x116e, 0x0000, 0x4e94, 0x0000, 0x516d, 0x0000, 0x4e03, + 0x0000, 0x4e5d, 0x0000, 0x682a, 0x0000, 0x6709, 0x0000, 0x793e, + 0x0000, 0x540d, 0x0000, 0x7279, 0x0000, 0x8ca1, 0x0000, 0x795d, + 0x0000, 0x52b4, 0x0000, 0x79d8, 0x0000, 0x7537, 0x0000, 0x9069, + 0x0000, 0x512a, 0x0000, 0x5370, 0x0000, 0x6ce8, 0x0000, 0x9805, + 0x0000, 0x4f11, 0x0000, 0x5199, 0x0000, 0x6b63, 0x0000, 0x5de6, + 0x0000, 0x53f3, 0x0000, 0x533b, 0x0000, 0x5b97, 0x0000, 0x5b66, + 0x0000, 0x76e3, 0x0000, 0x4f01, 0x0000, 0x8cc7, 0x0000, 0x5354, + 0x0000, 0x591c, 0x0000, 0x0033, 0x0036, 0x0000, 0x0033, 0x0037, + 0x0000, 0x0033, 0x0038, 0x0000, 0x0033, 0x0039, 0x0000, 0x0034, + 0x0030, 0x0000, 0x0034, 0x0031, 0x0000, 0x0034, 0x0032, 0x0000, + 0x0034, 0x0033, 0x0000, 0x0034, 0x0034, 0x0000, 0x0034, 0x0035, + 0x0000, 0x0034, 0x0036, 0x0000, 0x0034, 0x0037, 0x0000, 0x0034, + 0x0038, 0x0000, 0x0034, 0x0039, 0x0000, 0x0035, 0x0030, 0x0000, + 0x0031, 0x6708, 0x0000, 0x0032, 0x6708, 0x0000, 0x0033, 0x6708, + 0x0000, 0x0034, 0x6708, 0x0000, 0x0035, 0x6708, 0x0000, 0x0036, + 0x6708, 0x0000, 0x0037, 0x6708, 0x0000, 0x0038, 0x6708, 0x0000, + 0x0039, 0x6708, 0x0000, 0x0031, 0x0030, 0x6708, 0x0000, 0x0031, + 0x0031, 0x6708, 0x0000, 0x0031, 0x0032, 0x6708, 0x0000, 0x0048, + 0x0067, 0x0000, 0x0065, 0x0072, 0x0067, 0x0000, 0x0065, 0x0056, + 0x0000, 0x004c, 0x0054, 0x0044, 0x0000, 0x30a2, 0x0000, 0x30a4, + 0x0000, 0x30a6, 0x0000, 0x30a8, 0x0000, 0x30aa, 0x0000, 0x30ab, + 0x0000, 0x30ad, 0x0000, 0x30af, 0x0000, 0x30b1, 0x0000, 0x30b3, + 0x0000, 0x30b5, 0x0000, 0x30b7, 0x0000, 0x30b9, 0x0000, 0x30bb, + 0x0000, 0x30bd, 0x0000, 0x30bf, 0x0000, 0x30c1, 0x0000, 0x30c4, + 0x0000, 0x30c6, 0x0000, 0x30c8, 0x0000, 0x30ca, 0x0000, 0x30cb, + 0x0000, 0x30cc, 0x0000, 0x30cd, 0x0000, 0x30ce, 0x0000, 0x30cf, + 0x0000, 0x30d2, 0x0000, 0x30d5, 0x0000, 0x30d8, 0x0000, 0x30db, + 0x0000, 0x30de, 0x0000, 0x30df, 0x0000, 0x30e0, 0x0000, 0x30e1, + 0x0000, 0x30e2, 0x0000, 0x30e4, 0x0000, 0x30e6, 0x0000, 0x30e8, + 0x0000, 0x30e9, 0x0000, 0x30ea, 0x0000, 0x30eb, 0x0000, 0x30ec, + 0x0000, 0x30ed, 0x0000, 0x30ef, 0x0000, 0x30f0, 0x0000, 0x30f1, + 0x0000, 0x30f2, 0x0000, 0x30a2, 0x30cf, 0x309a, 0x30fc, 0x30c8, + 0x0000, 0x30a2, 0x30eb, 0x30d5, 0x30a1, 0x0000, 0x30a2, 0x30f3, + 0x30d8, 0x309a, 0x30a2, 0x0000, 0x30a2, 0x30fc, 0x30eb, 0x0000, + 0x30a4, 0x30cb, 0x30f3, 0x30af, 0x3099, 0x0000, 0x30a4, 0x30f3, + 0x30c1, 0x0000, 0x30a6, 0x30a9, 0x30f3, 0x0000, 0x30a8, 0x30b9, + 0x30af, 0x30fc, 0x30c8, 0x3099, 0x0000, 0x30a8, 0x30fc, 0x30ab, + 0x30fc, 0x0000, 0x30aa, 0x30f3, 0x30b9, 0x0000, 0x30aa, 0x30fc, + 0x30e0, 0x0000, 0x30ab, 0x30a4, 0x30ea, 0x0000, 0x30ab, 0x30e9, + 0x30c3, 0x30c8, 0x0000, 0x30ab, 0x30ed, 0x30ea, 0x30fc, 0x0000, + 0x30ab, 0x3099, 0x30ed, 0x30f3, 0x0000, 0x30ab, 0x3099, 0x30f3, + 0x30de, 0x0000, 0x30ad, 0x3099, 0x30ab, 0x3099, 0x0000, 0x30ad, + 0x3099, 0x30cb, 0x30fc, 0x0000, 0x30ad, 0x30e5, 0x30ea, 0x30fc, + 0x0000, 0x30ad, 0x3099, 0x30eb, 0x30bf, 0x3099, 0x30fc, 0x0000, + 0x30ad, 0x30ed, 0x0000, 0x30ad, 0x30ed, 0x30af, 0x3099, 0x30e9, + 0x30e0, 0x0000, 0x30ad, 0x30ed, 0x30e1, 0x30fc, 0x30c8, 0x30eb, + 0x0000, 0x30ad, 0x30ed, 0x30ef, 0x30c3, 0x30c8, 0x0000, 0x30af, + 0x3099, 0x30e9, 0x30e0, 0x0000, 0x30af, 0x3099, 0x30e9, 0x30e0, + 0x30c8, 0x30f3, 0x0000, 0x30af, 0x30eb, 0x30bb, 0x3099, 0x30a4, + 0x30ed, 0x0000, 0x30af, 0x30ed, 0x30fc, 0x30cd, 0x0000, 0x30b1, + 0x30fc, 0x30b9, 0x0000, 0x30b3, 0x30eb, 0x30ca, 0x0000, 0x30b3, + 0x30fc, 0x30db, 0x309a, 0x0000, 0x30b5, 0x30a4, 0x30af, 0x30eb, + 0x0000, 0x30b5, 0x30f3, 0x30c1, 0x30fc, 0x30e0, 0x0000, 0x30b7, + 0x30ea, 0x30f3, 0x30af, 0x3099, 0x0000, 0x30bb, 0x30f3, 0x30c1, + 0x0000, 0x30bb, 0x30f3, 0x30c8, 0x0000, 0x30bf, 0x3099, 0x30fc, + 0x30b9, 0x0000, 0x30c6, 0x3099, 0x30b7, 0x0000, 0x30c8, 0x3099, + 0x30eb, 0x0000, 0x30c8, 0x30f3, 0x0000, 0x30ca, 0x30ce, 0x0000, + 0x30ce, 0x30c3, 0x30c8, 0x0000, 0x30cf, 0x30a4, 0x30c4, 0x0000, + 0x30cf, 0x309a, 0x30fc, 0x30bb, 0x30f3, 0x30c8, 0x0000, 0x30cf, + 0x309a, 0x30fc, 0x30c4, 0x0000, 0x30cf, 0x3099, 0x30fc, 0x30ec, + 0x30eb, 0x0000, 0x30d2, 0x309a, 0x30a2, 0x30b9, 0x30c8, 0x30eb, + 0x0000, 0x30d2, 0x309a, 0x30af, 0x30eb, 0x0000, 0x30d2, 0x309a, + 0x30b3, 0x0000, 0x30d2, 0x3099, 0x30eb, 0x0000, 0x30d5, 0x30a1, + 0x30e9, 0x30c3, 0x30c8, 0x3099, 0x0000, 0x30d5, 0x30a3, 0x30fc, + 0x30c8, 0x0000, 0x30d5, 0x3099, 0x30c3, 0x30b7, 0x30a7, 0x30eb, + 0x0000, 0x30d5, 0x30e9, 0x30f3, 0x0000, 0x30d8, 0x30af, 0x30bf, + 0x30fc, 0x30eb, 0x0000, 0x30d8, 0x309a, 0x30bd, 0x0000, 0x30d8, + 0x309a, 0x30cb, 0x30d2, 0x0000, 0x30d8, 0x30eb, 0x30c4, 0x0000, + 0x30d8, 0x309a, 0x30f3, 0x30b9, 0x0000, 0x30d8, 0x309a, 0x30fc, + 0x30b7, 0x3099, 0x0000, 0x30d8, 0x3099, 0x30fc, 0x30bf, 0x0000, + 0x30db, 0x309a, 0x30a4, 0x30f3, 0x30c8, 0x0000, 0x30db, 0x3099, + 0x30eb, 0x30c8, 0x0000, 0x30db, 0x30f3, 0x0000, 0x30db, 0x309a, + 0x30f3, 0x30c8, 0x3099, 0x0000, 0x30db, 0x30fc, 0x30eb, 0x0000, + 0x30db, 0x30fc, 0x30f3, 0x0000, 0x30de, 0x30a4, 0x30af, 0x30ed, + 0x0000, 0x30de, 0x30a4, 0x30eb, 0x0000, 0x30de, 0x30c3, 0x30cf, + 0x0000, 0x30de, 0x30eb, 0x30af, 0x0000, 0x30de, 0x30f3, 0x30b7, + 0x30e7, 0x30f3, 0x0000, 0x30df, 0x30af, 0x30ed, 0x30f3, 0x0000, + 0x30df, 0x30ea, 0x0000, 0x30df, 0x30ea, 0x30cf, 0x3099, 0x30fc, + 0x30eb, 0x0000, 0x30e1, 0x30ab, 0x3099, 0x0000, 0x30e1, 0x30ab, + 0x3099, 0x30c8, 0x30f3, 0x0000, 0x30e1, 0x30fc, 0x30c8, 0x30eb, + 0x0000, 0x30e4, 0x30fc, 0x30c8, 0x3099, 0x0000, 0x30e4, 0x30fc, + 0x30eb, 0x0000, 0x30e6, 0x30a2, 0x30f3, 0x0000, 0x30ea, 0x30c3, + 0x30c8, 0x30eb, 0x0000, 0x30ea, 0x30e9, 0x0000, 0x30eb, 0x30d2, + 0x309a, 0x30fc, 0x0000, 0x30eb, 0x30fc, 0x30d5, 0x3099, 0x30eb, + 0x0000, 0x30ec, 0x30e0, 0x0000, 0x30ec, 0x30f3, 0x30c8, 0x30b1, + 0x3099, 0x30f3, 0x0000, 0x30ef, 0x30c3, 0x30c8, 0x0000, 0x0030, + 0x70b9, 0x0000, 0x0031, 0x70b9, 0x0000, 0x0032, 0x70b9, 0x0000, + 0x0033, 0x70b9, 0x0000, 0x0034, 0x70b9, 0x0000, 0x0035, 0x70b9, + 0x0000, 0x0036, 0x70b9, 0x0000, 0x0037, 0x70b9, 0x0000, 0x0038, + 0x70b9, 0x0000, 0x0039, 0x70b9, 0x0000, 0x0031, 0x0030, 0x70b9, + 0x0000, 0x0031, 0x0031, 0x70b9, 0x0000, 0x0031, 0x0032, 0x70b9, + 0x0000, 0x0031, 0x0033, 0x70b9, 0x0000, 0x0031, 0x0034, 0x70b9, + 0x0000, 0x0031, 0x0035, 0x70b9, 0x0000, 0x0031, 0x0036, 0x70b9, + 0x0000, 0x0031, 0x0037, 0x70b9, 0x0000, 0x0031, 0x0038, 0x70b9, + 0x0000, 0x0031, 0x0039, 0x70b9, 0x0000, 0x0032, 0x0030, 0x70b9, + 0x0000, 0x0032, 0x0031, 0x70b9, 0x0000, 0x0032, 0x0032, 0x70b9, + 0x0000, 0x0032, 0x0033, 0x70b9, 0x0000, 0x0032, 0x0034, 0x70b9, + 0x0000, 0x0068, 0x0050, 0x0061, 0x0000, 0x0064, 0x0061, 0x0000, + 0x0041, 0x0055, 0x0000, 0x0062, 0x0061, 0x0072, 0x0000, 0x006f, + 0x0056, 0x0000, 0x0070, 0x0063, 0x0000, 0x0064, 0x006d, 0x0000, + 0x0064, 0x006d, 0x0032, 0x0000, 0x0064, 0x006d, 0x0033, 0x0000, + 0x0049, 0x0055, 0x0000, 0x5e73, 0x6210, 0x0000, 0x662d, 0x548c, + 0x0000, 0x5927, 0x6b63, 0x0000, 0x660e, 0x6cbb, 0x0000, 0x682a, + 0x5f0f, 0x4f1a, 0x793e, 0x0000, 0x0070, 0x0041, 0x0000, 0x006e, + 0x0041, 0x0000, 0x03bc, 0x0041, 0x0000, 0x006d, 0x0041, 0x0000, + 0x006b, 0x0041, 0x0000, 0x004b, 0x0042, 0x0000, 0x004d, 0x0042, + 0x0000, 0x0047, 0x0042, 0x0000, 0x0063, 0x0061, 0x006c, 0x0000, + 0x006b, 0x0063, 0x0061, 0x006c, 0x0000, 0x0070, 0x0046, 0x0000, + 0x006e, 0x0046, 0x0000, 0x03bc, 0x0046, 0x0000, 0x03bc, 0x0067, + 0x0000, 0x006d, 0x0067, 0x0000, 0x006b, 0x0067, 0x0000, 0x0048, + 0x007a, 0x0000, 0x006b, 0x0048, 0x007a, 0x0000, 0x004d, 0x0048, + 0x007a, 0x0000, 0x0047, 0x0048, 0x007a, 0x0000, 0x0054, 0x0048, + 0x007a, 0x0000, 0x03bc, 0x006c, 0x0000, 0x006d, 0x006c, 0x0000, + 0x0064, 0x006c, 0x0000, 0x006b, 0x006c, 0x0000, 0x0066, 0x006d, + 0x0000, 0x006e, 0x006d, 0x0000, 0x03bc, 0x006d, 0x0000, 0x006d, + 0x006d, 0x0000, 0x0063, 0x006d, 0x0000, 0x006b, 0x006d, 0x0000, + 0x006d, 0x006d, 0x0032, 0x0000, 0x0063, 0x006d, 0x0032, 0x0000, + 0x006d, 0x0032, 0x0000, 0x006b, 0x006d, 0x0032, 0x0000, 0x006d, + 0x006d, 0x0033, 0x0000, 0x0063, 0x006d, 0x0033, 0x0000, 0x006d, + 0x0033, 0x0000, 0x006b, 0x006d, 0x0033, 0x0000, 0x006d, 0x2215, + 0x0073, 0x0000, 0x006d, 0x2215, 0x0073, 0x0032, 0x0000, 0x0050, + 0x0061, 0x0000, 0x006b, 0x0050, 0x0061, 0x0000, 0x004d, 0x0050, + 0x0061, 0x0000, 0x0047, 0x0050, 0x0061, 0x0000, 0x0072, 0x0061, + 0x0064, 0x0000, 0x0072, 0x0061, 0x0064, 0x2215, 0x0073, 0x0000, + 0x0072, 0x0061, 0x0064, 0x2215, 0x0073, 0x0032, 0x0000, 0x0070, + 0x0073, 0x0000, 0x006e, 0x0073, 0x0000, 0x03bc, 0x0073, 0x0000, + 0x006d, 0x0073, 0x0000, 0x0070, 0x0056, 0x0000, 0x006e, 0x0056, + 0x0000, 0x03bc, 0x0056, 0x0000, 0x006d, 0x0056, 0x0000, 0x006b, + 0x0056, 0x0000, 0x004d, 0x0056, 0x0000, 0x0070, 0x0057, 0x0000, + 0x006e, 0x0057, 0x0000, 0x03bc, 0x0057, 0x0000, 0x006d, 0x0057, + 0x0000, 0x006b, 0x0057, 0x0000, 0x004d, 0x0057, 0x0000, 0x006b, + 0x03a9, 0x0000, 0x004d, 0x03a9, 0x0000, 0x0061, 0x002e, 0x006d, + 0x002e, 0x0000, 0x0042, 0x0071, 0x0000, 0x0063, 0x0063, 0x0000, + 0x0063, 0x0064, 0x0000, 0x0043, 0x2215, 0x006b, 0x0067, 0x0000, + 0x0043, 0x006f, 0x002e, 0x0000, 0x0064, 0x0042, 0x0000, 0x0047, + 0x0079, 0x0000, 0x0068, 0x0061, 0x0000, 0x0048, 0x0050, 0x0000, + 0x0069, 0x006e, 0x0000, 0x004b, 0x004b, 0x0000, 0x004b, 0x004d, + 0x0000, 0x006b, 0x0074, 0x0000, 0x006c, 0x006d, 0x0000, 0x006c, + 0x006e, 0x0000, 0x006c, 0x006f, 0x0067, 0x0000, 0x006c, 0x0078, + 0x0000, 0x006d, 0x0062, 0x0000, 0x006d, 0x0069, 0x006c, 0x0000, + 0x006d, 0x006f, 0x006c, 0x0000, 0x0050, 0x0048, 0x0000, 0x0070, + 0x002e, 0x006d, 0x002e, 0x0000, 0x0050, 0x0050, 0x004d, 0x0000, + 0x0050, 0x0052, 0x0000, 0x0073, 0x0072, 0x0000, 0x0053, 0x0076, + 0x0000, 0x0057, 0x0062, 0x0000, 0x0056, 0x2215, 0x006d, 0x0000, + 0x0041, 0x2215, 0x006d, 0x0000, 0x0031, 0x65e5, 0x0000, 0x0032, + 0x65e5, 0x0000, 0x0033, 0x65e5, 0x0000, 0x0034, 0x65e5, 0x0000, + 0x0035, 0x65e5, 0x0000, 0x0036, 0x65e5, 0x0000, 0x0037, 0x65e5, + 0x0000, 0x0038, 0x65e5, 0x0000, 0x0039, 0x65e5, 0x0000, 0x0031, + 0x0030, 0x65e5, 0x0000, 0x0031, 0x0031, 0x65e5, 0x0000, 0x0031, + 0x0032, 0x65e5, 0x0000, 0x0031, 0x0033, 0x65e5, 0x0000, 0x0031, + 0x0034, 0x65e5, 0x0000, 0x0031, 0x0035, 0x65e5, 0x0000, 0x0031, + 0x0036, 0x65e5, 0x0000, 0x0031, 0x0037, 0x65e5, 0x0000, 0x0031, + 0x0038, 0x65e5, 0x0000, 0x0031, 0x0039, 0x65e5, 0x0000, 0x0032, + 0x0030, 0x65e5, 0x0000, 0x0032, 0x0031, 0x65e5, 0x0000, 0x0032, + 0x0032, 0x65e5, 0x0000, 0x0032, 0x0033, 0x65e5, 0x0000, 0x0032, + 0x0034, 0x65e5, 0x0000, 0x0032, 0x0035, 0x65e5, 0x0000, 0x0032, + 0x0036, 0x65e5, 0x0000, 0x0032, 0x0037, 0x65e5, 0x0000, 0x0032, + 0x0038, 0x65e5, 0x0000, 0x0032, 0x0039, 0x65e5, 0x0000, 0x0033, + 0x0030, 0x65e5, 0x0000, 0x0033, 0x0031, 0x65e5, 0x0000, 0x0067, + 0x0061, 0x006c, 0x0000, 0x044a, 0x0000, 0x044c, 0x0000, 0xa76f, + 0x0000, 0x0126, 0x0000, 0x0153, 0x0000, 0xa727, 0x0000, 0xab37, + 0x0000, 0x026b, 0x0000, 0xab52, 0x0000, 0x8c48, 0x0000, 0x66f4, + 0x0000, 0x8cc8, 0x0000, 0x6ed1, 0x0000, 0x4e32, 0x0000, 0x53e5, + 0x0000, 0x5951, 0x0000, 0x5587, 0x0000, 0x5948, 0x0000, 0x61f6, + 0x0000, 0x7669, 0x0000, 0x7f85, 0x0000, 0x863f, 0x0000, 0x87ba, + 0x0000, 0x88f8, 0x0000, 0x908f, 0x0000, 0x6a02, 0x0000, 0x6d1b, + 0x0000, 0x70d9, 0x0000, 0x73de, 0x0000, 0x843d, 0x0000, 0x916a, + 0x0000, 0x99f1, 0x0000, 0x4e82, 0x0000, 0x5375, 0x0000, 0x6b04, + 0x0000, 0x721b, 0x0000, 0x862d, 0x0000, 0x9e1e, 0x0000, 0x5d50, + 0x0000, 0x6feb, 0x0000, 0x85cd, 0x0000, 0x8964, 0x0000, 0x62c9, + 0x0000, 0x81d8, 0x0000, 0x881f, 0x0000, 0x5eca, 0x0000, 0x6717, + 0x0000, 0x6d6a, 0x0000, 0x72fc, 0x0000, 0x90ce, 0x0000, 0x4f86, + 0x0000, 0x51b7, 0x0000, 0x52de, 0x0000, 0x64c4, 0x0000, 0x6ad3, + 0x0000, 0x7210, 0x0000, 0x76e7, 0x0000, 0x8606, 0x0000, 0x865c, + 0x0000, 0x8def, 0x0000, 0x9732, 0x0000, 0x9b6f, 0x0000, 0x9dfa, + 0x0000, 0x788c, 0x0000, 0x797f, 0x0000, 0x7da0, 0x0000, 0x83c9, + 0x0000, 0x9304, 0x0000, 0x8ad6, 0x0000, 0x58df, 0x0000, 0x5f04, + 0x0000, 0x7c60, 0x0000, 0x807e, 0x0000, 0x7262, 0x0000, 0x78ca, + 0x0000, 0x8cc2, 0x0000, 0x96f7, 0x0000, 0x58d8, 0x0000, 0x5c62, + 0x0000, 0x6a13, 0x0000, 0x6dda, 0x0000, 0x6f0f, 0x0000, 0x7d2f, + 0x0000, 0x7e37, 0x0000, 0x964b, 0x0000, 0x52d2, 0x0000, 0x808b, + 0x0000, 0x51dc, 0x0000, 0x51cc, 0x0000, 0x7a1c, 0x0000, 0x7dbe, + 0x0000, 0x83f1, 0x0000, 0x9675, 0x0000, 0x8b80, 0x0000, 0x62cf, + 0x0000, 0x8afe, 0x0000, 0x4e39, 0x0000, 0x5be7, 0x0000, 0x6012, + 0x0000, 0x7387, 0x0000, 0x7570, 0x0000, 0x5317, 0x0000, 0x78fb, + 0x0000, 0x4fbf, 0x0000, 0x5fa9, 0x0000, 0x4e0d, 0x0000, 0x6ccc, + 0x0000, 0x6578, 0x0000, 0x7d22, 0x0000, 0x53c3, 0x0000, 0x585e, + 0x0000, 0x7701, 0x0000, 0x8449, 0x0000, 0x8aaa, 0x0000, 0x6bba, + 0x0000, 0x6c88, 0x0000, 0x62fe, 0x0000, 0x82e5, 0x0000, 0x63a0, + 0x0000, 0x7565, 0x0000, 0x4eae, 0x0000, 0x5169, 0x0000, 0x51c9, + 0x0000, 0x6881, 0x0000, 0x7ce7, 0x0000, 0x826f, 0x0000, 0x8ad2, + 0x0000, 0x91cf, 0x0000, 0x52f5, 0x0000, 0x5442, 0x0000, 0x5eec, + 0x0000, 0x65c5, 0x0000, 0x6ffe, 0x0000, 0x792a, 0x0000, 0x95ad, + 0x0000, 0x9a6a, 0x0000, 0x9e97, 0x0000, 0x9ece, 0x0000, 0x66c6, + 0x0000, 0x6b77, 0x0000, 0x8f62, 0x0000, 0x5e74, 0x0000, 0x6190, + 0x0000, 0x6200, 0x0000, 0x649a, 0x0000, 0x6f23, 0x0000, 0x7149, + 0x0000, 0x7489, 0x0000, 0x79ca, 0x0000, 0x7df4, 0x0000, 0x806f, + 0x0000, 0x8f26, 0x0000, 0x84ee, 0x0000, 0x9023, 0x0000, 0x934a, + 0x0000, 0x5217, 0x0000, 0x52a3, 0x0000, 0x54bd, 0x0000, 0x70c8, + 0x0000, 0x88c2, 0x0000, 0x5ec9, 0x0000, 0x5ff5, 0x0000, 0x637b, + 0x0000, 0x6bae, 0x0000, 0x7c3e, 0x0000, 0x7375, 0x0000, 0x4ee4, + 0x0000, 0x56f9, 0x0000, 0x5dba, 0x0000, 0x601c, 0x0000, 0x73b2, + 0x0000, 0x7469, 0x0000, 0x7f9a, 0x0000, 0x8046, 0x0000, 0x9234, + 0x0000, 0x96f6, 0x0000, 0x9748, 0x0000, 0x9818, 0x0000, 0x4f8b, + 0x0000, 0x79ae, 0x0000, 0x91b4, 0x0000, 0x96b8, 0x0000, 0x60e1, + 0x0000, 0x4e86, 0x0000, 0x50da, 0x0000, 0x5bee, 0x0000, 0x5c3f, + 0x0000, 0x6599, 0x0000, 0x71ce, 0x0000, 0x7642, 0x0000, 0x84fc, + 0x0000, 0x907c, 0x0000, 0x6688, 0x0000, 0x962e, 0x0000, 0x5289, + 0x0000, 0x677b, 0x0000, 0x67f3, 0x0000, 0x6d41, 0x0000, 0x6e9c, + 0x0000, 0x7409, 0x0000, 0x7559, 0x0000, 0x786b, 0x0000, 0x7d10, + 0x0000, 0x985e, 0x0000, 0x622e, 0x0000, 0x9678, 0x0000, 0x502b, + 0x0000, 0x5d19, 0x0000, 0x6dea, 0x0000, 0x8f2a, 0x0000, 0x5f8b, + 0x0000, 0x6144, 0x0000, 0x6817, 0x0000, 0x9686, 0x0000, 0x5229, + 0x0000, 0x540f, 0x0000, 0x5c65, 0x0000, 0x6613, 0x0000, 0x674e, + 0x0000, 0x68a8, 0x0000, 0x6ce5, 0x0000, 0x7406, 0x0000, 0x75e2, + 0x0000, 0x7f79, 0x0000, 0x88cf, 0x0000, 0x88e1, 0x0000, 0x96e2, + 0x0000, 0x533f, 0x0000, 0x6eba, 0x0000, 0x541d, 0x0000, 0x71d0, + 0x0000, 0x7498, 0x0000, 0x85fa, 0x0000, 0x96a3, 0x0000, 0x9c57, + 0x0000, 0x9e9f, 0x0000, 0x6797, 0x0000, 0x6dcb, 0x0000, 0x81e8, + 0x0000, 0x7b20, 0x0000, 0x7c92, 0x0000, 0x72c0, 0x0000, 0x7099, + 0x0000, 0x8b58, 0x0000, 0x4ec0, 0x0000, 0x8336, 0x0000, 0x523a, + 0x0000, 0x5207, 0x0000, 0x5ea6, 0x0000, 0x62d3, 0x0000, 0x7cd6, + 0x0000, 0x5b85, 0x0000, 0x6d1e, 0x0000, 0x66b4, 0x0000, 0x8f3b, + 0x0000, 0x964d, 0x0000, 0x5ed3, 0x0000, 0x5140, 0x0000, 0x55c0, + 0x0000, 0x585a, 0x0000, 0x6674, 0x0000, 0x51de, 0x0000, 0x732a, + 0x0000, 0x76ca, 0x0000, 0x793c, 0x0000, 0x795e, 0x0000, 0x7965, + 0x0000, 0x798f, 0x0000, 0x9756, 0x0000, 0x7cbe, 0x0000, 0x8612, + 0x0000, 0x8af8, 0x0000, 0x9038, 0x0000, 0x90fd, 0x0000, 0x98ef, + 0x0000, 0x98fc, 0x0000, 0x9928, 0x0000, 0x9db4, 0x0000, 0x90de, + 0x0000, 0x96b7, 0x0000, 0x4fae, 0x0000, 0x50e7, 0x0000, 0x514d, + 0x0000, 0x52c9, 0x0000, 0x52e4, 0x0000, 0x5351, 0x0000, 0x559d, + 0x0000, 0x5606, 0x0000, 0x5668, 0x0000, 0x5840, 0x0000, 0x58a8, + 0x0000, 0x5c64, 0x0000, 0x6094, 0x0000, 0x6168, 0x0000, 0x618e, + 0x0000, 0x61f2, 0x0000, 0x654f, 0x0000, 0x65e2, 0x0000, 0x6691, + 0x0000, 0x6885, 0x0000, 0x6d77, 0x0000, 0x6e1a, 0x0000, 0x6f22, + 0x0000, 0x716e, 0x0000, 0x722b, 0x0000, 0x7422, 0x0000, 0x7891, + 0x0000, 0x7949, 0x0000, 0x7948, 0x0000, 0x7950, 0x0000, 0x7956, + 0x0000, 0x798d, 0x0000, 0x798e, 0x0000, 0x7a40, 0x0000, 0x7a81, + 0x0000, 0x7bc0, 0x0000, 0x7e09, 0x0000, 0x7e41, 0x0000, 0x7f72, + 0x0000, 0x8005, 0x0000, 0x81ed, 0x0000, 0x8279, 0x0000, 0x8457, + 0x0000, 0x8910, 0x0000, 0x8996, 0x0000, 0x8b01, 0x0000, 0x8b39, + 0x0000, 0x8cd3, 0x0000, 0x8d08, 0x0000, 0x8fb6, 0x0000, 0x96e3, + 0x0000, 0x97ff, 0x0000, 0x983b, 0x0000, 0x6075, 0x0000, 0xd850, + 0xdeee, 0x0000, 0x8218, 0x0000, 0x4e26, 0x0000, 0x51b5, 0x0000, + 0x5168, 0x0000, 0x4f80, 0x0000, 0x5145, 0x0000, 0x5180, 0x0000, + 0x52c7, 0x0000, 0x52fa, 0x0000, 0x5555, 0x0000, 0x5599, 0x0000, + 0x55e2, 0x0000, 0x58b3, 0x0000, 0x5944, 0x0000, 0x5954, 0x0000, + 0x5a62, 0x0000, 0x5b28, 0x0000, 0x5ed2, 0x0000, 0x5ed9, 0x0000, + 0x5f69, 0x0000, 0x5fad, 0x0000, 0x60d8, 0x0000, 0x614e, 0x0000, + 0x6108, 0x0000, 0x6160, 0x0000, 0x6234, 0x0000, 0x63c4, 0x0000, + 0x641c, 0x0000, 0x6452, 0x0000, 0x6556, 0x0000, 0x671b, 0x0000, + 0x6756, 0x0000, 0x6edb, 0x0000, 0x6ecb, 0x0000, 0x701e, 0x0000, + 0x77a7, 0x0000, 0x7235, 0x0000, 0x72af, 0x0000, 0x7471, 0x0000, + 0x7506, 0x0000, 0x753b, 0x0000, 0x761d, 0x0000, 0x761f, 0x0000, + 0x76db, 0x0000, 0x76f4, 0x0000, 0x774a, 0x0000, 0x7740, 0x0000, + 0x78cc, 0x0000, 0x7ab1, 0x0000, 0x7c7b, 0x0000, 0x7d5b, 0x0000, + 0x7f3e, 0x0000, 0x8352, 0x0000, 0x83ef, 0x0000, 0x8779, 0x0000, + 0x8941, 0x0000, 0x8986, 0x0000, 0x8abf, 0x0000, 0x8acb, 0x0000, + 0x8aed, 0x0000, 0x8b8a, 0x0000, 0x8f38, 0x0000, 0x9072, 0x0000, + 0x9199, 0x0000, 0x9276, 0x0000, 0x967c, 0x0000, 0x97db, 0x0000, + 0x980b, 0x0000, 0x9b12, 0x0000, 0xd84a, 0xdc4a, 0x0000, 0xd84a, + 0xdc44, 0x0000, 0xd84c, 0xdfd5, 0x0000, 0x3b9d, 0x0000, 0x4018, + 0x0000, 0x4039, 0x0000, 0xd854, 0xde49, 0x0000, 0xd857, 0xdcd0, + 0x0000, 0xd85f, 0xded3, 0x0000, 0x9f43, 0x0000, 0x9f8e, 0x0000, + 0x0066, 0x0066, 0x0000, 0x0066, 0x0069, 0x0000, 0x0066, 0x006c, + 0x0000, 0x0066, 0x0066, 0x0069, 0x0000, 0x0066, 0x0066, 0x006c, + 0x0000, 0x0073, 0x0074, 0x0000, 0x0574, 0x0576, 0x0000, 0x0574, + 0x0565, 0x0000, 0x0574, 0x056b, 0x0000, 0x057e, 0x0576, 0x0000, + 0x0574, 0x056d, 0x0000, 0x05d9, 0x05b4, 0x0000, 0x05f2, 0x05b7, + 0x0000, 0x05e2, 0x0000, 0x05d4, 0x0000, 0x05db, 0x0000, 0x05dc, + 0x0000, 0x05dd, 0x0000, 0x05e8, 0x0000, 0x05ea, 0x0000, 0x05e9, + 0x05c1, 0x0000, 0x05e9, 0x05c2, 0x0000, 0x05e9, 0x05bc, 0x05c1, + 0x0000, 0x05e9, 0x05bc, 0x05c2, 0x0000, 0x05d0, 0x05b7, 0x0000, + 0x05d0, 0x05b8, 0x0000, 0x05d0, 0x05bc, 0x0000, 0x05d1, 0x05bc, + 0x0000, 0x05d2, 0x05bc, 0x0000, 0x05d3, 0x05bc, 0x0000, 0x05d4, + 0x05bc, 0x0000, 0x05d5, 0x05bc, 0x0000, 0x05d6, 0x05bc, 0x0000, + 0x05d8, 0x05bc, 0x0000, 0x05d9, 0x05bc, 0x0000, 0x05da, 0x05bc, + 0x0000, 0x05db, 0x05bc, 0x0000, 0x05dc, 0x05bc, 0x0000, 0x05de, + 0x05bc, 0x0000, 0x05e0, 0x05bc, 0x0000, 0x05e1, 0x05bc, 0x0000, + 0x05e3, 0x05bc, 0x0000, 0x05e4, 0x05bc, 0x0000, 0x05e6, 0x05bc, + 0x0000, 0x05e7, 0x05bc, 0x0000, 0x05e8, 0x05bc, 0x0000, 0x05e9, + 0x05bc, 0x0000, 0x05ea, 0x05bc, 0x0000, 0x05d5, 0x05b9, 0x0000, + 0x05d1, 0x05bf, 0x0000, 0x05db, 0x05bf, 0x0000, 0x05e4, 0x05bf, + 0x0000, 0x05d0, 0x05dc, 0x0000, 0x0671, 0x0000, 0x067b, 0x0000, + 0x067e, 0x0000, 0x0680, 0x0000, 0x067a, 0x0000, 0x067f, 0x0000, + 0x0679, 0x0000, 0x06a4, 0x0000, 0x06a6, 0x0000, 0x0684, 0x0000, + 0x0683, 0x0000, 0x0686, 0x0000, 0x0687, 0x0000, 0x068d, 0x0000, + 0x068c, 0x0000, 0x068e, 0x0000, 0x0688, 0x0000, 0x0698, 0x0000, + 0x0691, 0x0000, 0x06a9, 0x0000, 0x06af, 0x0000, 0x06b3, 0x0000, + 0x06b1, 0x0000, 0x06ba, 0x0000, 0x06bb, 0x0000, 0x06c1, 0x0000, + 0x06be, 0x0000, 0x06d2, 0x0000, 0x06ad, 0x0000, 0x06c7, 0x0000, + 0x06c6, 0x0000, 0x06c8, 0x0000, 0x06cb, 0x0000, 0x06c5, 0x0000, + 0x06c9, 0x0000, 0x06d0, 0x0000, 0x0649, 0x0000, 0x064a, 0x0654, + 0x0627, 0x0000, 0x064a, 0x0654, 0x06d5, 0x0000, 0x064a, 0x0654, + 0x0648, 0x0000, 0x064a, 0x0654, 0x06c7, 0x0000, 0x064a, 0x0654, + 0x06c6, 0x0000, 0x064a, 0x0654, 0x06c8, 0x0000, 0x064a, 0x0654, + 0x06d0, 0x0000, 0x064a, 0x0654, 0x0649, 0x0000, 0x06cc, 0x0000, + 0x064a, 0x0654, 0x062c, 0x0000, 0x064a, 0x0654, 0x062d, 0x0000, + 0x064a, 0x0654, 0x0645, 0x0000, 0x064a, 0x0654, 0x064a, 0x0000, + 0x0628, 0x062c, 0x0000, 0x0628, 0x062d, 0x0000, 0x0628, 0x062e, + 0x0000, 0x0628, 0x0645, 0x0000, 0x0628, 0x0649, 0x0000, 0x0628, + 0x064a, 0x0000, 0x062a, 0x062c, 0x0000, 0x062a, 0x062d, 0x0000, + 0x062a, 0x062e, 0x0000, 0x062a, 0x0645, 0x0000, 0x062a, 0x0649, + 0x0000, 0x062a, 0x064a, 0x0000, 0x062b, 0x062c, 0x0000, 0x062b, + 0x0645, 0x0000, 0x062b, 0x0649, 0x0000, 0x062b, 0x064a, 0x0000, + 0x062c, 0x062d, 0x0000, 0x062c, 0x0645, 0x0000, 0x062d, 0x062c, + 0x0000, 0x062d, 0x0645, 0x0000, 0x062e, 0x062c, 0x0000, 0x062e, + 0x062d, 0x0000, 0x062e, 0x0645, 0x0000, 0x0633, 0x062c, 0x0000, + 0x0633, 0x062d, 0x0000, 0x0633, 0x062e, 0x0000, 0x0633, 0x0645, + 0x0000, 0x0635, 0x062d, 0x0000, 0x0635, 0x0645, 0x0000, 0x0636, + 0x062c, 0x0000, 0x0636, 0x062d, 0x0000, 0x0636, 0x062e, 0x0000, + 0x0636, 0x0645, 0x0000, 0x0637, 0x062d, 0x0000, 0x0637, 0x0645, + 0x0000, 0x0638, 0x0645, 0x0000, 0x0639, 0x062c, 0x0000, 0x0639, + 0x0645, 0x0000, 0x063a, 0x062c, 0x0000, 0x063a, 0x0645, 0x0000, + 0x0641, 0x062c, 0x0000, 0x0641, 0x062d, 0x0000, 0x0641, 0x062e, + 0x0000, 0x0641, 0x0645, 0x0000, 0x0641, 0x0649, 0x0000, 0x0641, + 0x064a, 0x0000, 0x0642, 0x062d, 0x0000, 0x0642, 0x0645, 0x0000, + 0x0642, 0x0649, 0x0000, 0x0642, 0x064a, 0x0000, 0x0643, 0x0627, + 0x0000, 0x0643, 0x062c, 0x0000, 0x0643, 0x062d, 0x0000, 0x0643, + 0x062e, 0x0000, 0x0643, 0x0644, 0x0000, 0x0643, 0x0645, 0x0000, + 0x0643, 0x0649, 0x0000, 0x0643, 0x064a, 0x0000, 0x0644, 0x062c, + 0x0000, 0x0644, 0x062d, 0x0000, 0x0644, 0x062e, 0x0000, 0x0644, + 0x0645, 0x0000, 0x0644, 0x0649, 0x0000, 0x0644, 0x064a, 0x0000, + 0x0645, 0x062c, 0x0000, 0x0645, 0x062d, 0x0000, 0x0645, 0x062e, + 0x0000, 0x0645, 0x0645, 0x0000, 0x0645, 0x0649, 0x0000, 0x0645, + 0x064a, 0x0000, 0x0646, 0x062c, 0x0000, 0x0646, 0x062d, 0x0000, + 0x0646, 0x062e, 0x0000, 0x0646, 0x0645, 0x0000, 0x0646, 0x0649, + 0x0000, 0x0646, 0x064a, 0x0000, 0x0647, 0x062c, 0x0000, 0x0647, + 0x0645, 0x0000, 0x0647, 0x0649, 0x0000, 0x0647, 0x064a, 0x0000, + 0x064a, 0x062c, 0x0000, 0x064a, 0x062d, 0x0000, 0x064a, 0x062e, + 0x0000, 0x064a, 0x0645, 0x0000, 0x064a, 0x0649, 0x0000, 0x064a, + 0x064a, 0x0000, 0x0630, 0x0670, 0x0000, 0x0631, 0x0670, 0x0000, + 0x0649, 0x0670, 0x0000, 0x0020, 0x064c, 0x0651, 0x0000, 0x0020, + 0x064d, 0x0651, 0x0000, 0x0020, 0x064e, 0x0651, 0x0000, 0x0020, + 0x064f, 0x0651, 0x0000, 0x0020, 0x0650, 0x0651, 0x0000, 0x0020, + 0x0651, 0x0670, 0x0000, 0x064a, 0x0654, 0x0631, 0x0000, 0x064a, + 0x0654, 0x0632, 0x0000, 0x064a, 0x0654, 0x0646, 0x0000, 0x0628, + 0x0631, 0x0000, 0x0628, 0x0632, 0x0000, 0x0628, 0x0646, 0x0000, + 0x062a, 0x0631, 0x0000, 0x062a, 0x0632, 0x0000, 0x062a, 0x0646, + 0x0000, 0x062b, 0x0631, 0x0000, 0x062b, 0x0632, 0x0000, 0x062b, + 0x0646, 0x0000, 0x0645, 0x0627, 0x0000, 0x0646, 0x0631, 0x0000, + 0x0646, 0x0632, 0x0000, 0x0646, 0x0646, 0x0000, 0x064a, 0x0631, + 0x0000, 0x064a, 0x0632, 0x0000, 0x064a, 0x0646, 0x0000, 0x064a, + 0x0654, 0x062e, 0x0000, 0x064a, 0x0654, 0x0647, 0x0000, 0x0628, + 0x0647, 0x0000, 0x062a, 0x0647, 0x0000, 0x0635, 0x062e, 0x0000, + 0x0644, 0x0647, 0x0000, 0x0646, 0x0647, 0x0000, 0x0647, 0x0670, + 0x0000, 0x064a, 0x0647, 0x0000, 0x062b, 0x0647, 0x0000, 0x0633, + 0x0647, 0x0000, 0x0634, 0x0645, 0x0000, 0x0634, 0x0647, 0x0000, + 0x0640, 0x064e, 0x0651, 0x0000, 0x0640, 0x064f, 0x0651, 0x0000, + 0x0640, 0x0650, 0x0651, 0x0000, 0x0637, 0x0649, 0x0000, 0x0637, + 0x064a, 0x0000, 0x0639, 0x0649, 0x0000, 0x0639, 0x064a, 0x0000, + 0x063a, 0x0649, 0x0000, 0x063a, 0x064a, 0x0000, 0x0633, 0x0649, + 0x0000, 0x0633, 0x064a, 0x0000, 0x0634, 0x0649, 0x0000, 0x0634, + 0x064a, 0x0000, 0x062d, 0x0649, 0x0000, 0x062d, 0x064a, 0x0000, + 0x062c, 0x0649, 0x0000, 0x062c, 0x064a, 0x0000, 0x062e, 0x0649, + 0x0000, 0x062e, 0x064a, 0x0000, 0x0635, 0x0649, 0x0000, 0x0635, + 0x064a, 0x0000, 0x0636, 0x0649, 0x0000, 0x0636, 0x064a, 0x0000, + 0x0634, 0x062c, 0x0000, 0x0634, 0x062d, 0x0000, 0x0634, 0x062e, + 0x0000, 0x0634, 0x0631, 0x0000, 0x0633, 0x0631, 0x0000, 0x0635, + 0x0631, 0x0000, 0x0636, 0x0631, 0x0000, 0x0627, 0x064b, 0x0000, + 0x062a, 0x062c, 0x0645, 0x0000, 0x062a, 0x062d, 0x062c, 0x0000, + 0x062a, 0x062d, 0x0645, 0x0000, 0x062a, 0x062e, 0x0645, 0x0000, + 0x062a, 0x0645, 0x062c, 0x0000, 0x062a, 0x0645, 0x062d, 0x0000, + 0x062a, 0x0645, 0x062e, 0x0000, 0x062c, 0x0645, 0x062d, 0x0000, + 0x062d, 0x0645, 0x064a, 0x0000, 0x062d, 0x0645, 0x0649, 0x0000, + 0x0633, 0x062d, 0x062c, 0x0000, 0x0633, 0x062c, 0x062d, 0x0000, + 0x0633, 0x062c, 0x0649, 0x0000, 0x0633, 0x0645, 0x062d, 0x0000, + 0x0633, 0x0645, 0x062c, 0x0000, 0x0633, 0x0645, 0x0645, 0x0000, + 0x0635, 0x062d, 0x062d, 0x0000, 0x0635, 0x0645, 0x0645, 0x0000, + 0x0634, 0x062d, 0x0645, 0x0000, 0x0634, 0x062c, 0x064a, 0x0000, + 0x0634, 0x0645, 0x062e, 0x0000, 0x0634, 0x0645, 0x0645, 0x0000, + 0x0636, 0x062d, 0x0649, 0x0000, 0x0636, 0x062e, 0x0645, 0x0000, + 0x0637, 0x0645, 0x062d, 0x0000, 0x0637, 0x0645, 0x0645, 0x0000, + 0x0637, 0x0645, 0x064a, 0x0000, 0x0639, 0x062c, 0x0645, 0x0000, + 0x0639, 0x0645, 0x0645, 0x0000, 0x0639, 0x0645, 0x0649, 0x0000, + 0x063a, 0x0645, 0x0645, 0x0000, 0x063a, 0x0645, 0x064a, 0x0000, + 0x063a, 0x0645, 0x0649, 0x0000, 0x0641, 0x062e, 0x0645, 0x0000, + 0x0642, 0x0645, 0x062d, 0x0000, 0x0642, 0x0645, 0x0645, 0x0000, + 0x0644, 0x062d, 0x0645, 0x0000, 0x0644, 0x062d, 0x064a, 0x0000, + 0x0644, 0x062d, 0x0649, 0x0000, 0x0644, 0x062c, 0x062c, 0x0000, + 0x0644, 0x062e, 0x0645, 0x0000, 0x0644, 0x0645, 0x062d, 0x0000, + 0x0645, 0x062d, 0x062c, 0x0000, 0x0645, 0x062d, 0x0645, 0x0000, + 0x0645, 0x062d, 0x064a, 0x0000, 0x0645, 0x062c, 0x062d, 0x0000, + 0x0645, 0x062c, 0x0645, 0x0000, 0x0645, 0x062e, 0x062c, 0x0000, + 0x0645, 0x062e, 0x0645, 0x0000, 0x0645, 0x062c, 0x062e, 0x0000, + 0x0647, 0x0645, 0x062c, 0x0000, 0x0647, 0x0645, 0x0645, 0x0000, + 0x0646, 0x062d, 0x0645, 0x0000, 0x0646, 0x062d, 0x0649, 0x0000, + 0x0646, 0x062c, 0x0645, 0x0000, 0x0646, 0x062c, 0x0649, 0x0000, + 0x0646, 0x0645, 0x064a, 0x0000, 0x0646, 0x0645, 0x0649, 0x0000, + 0x064a, 0x0645, 0x0645, 0x0000, 0x0628, 0x062e, 0x064a, 0x0000, + 0x062a, 0x062c, 0x064a, 0x0000, 0x062a, 0x062c, 0x0649, 0x0000, + 0x062a, 0x062e, 0x064a, 0x0000, 0x062a, 0x062e, 0x0649, 0x0000, + 0x062a, 0x0645, 0x064a, 0x0000, 0x062a, 0x0645, 0x0649, 0x0000, + 0x062c, 0x0645, 0x064a, 0x0000, 0x062c, 0x062d, 0x0649, 0x0000, + 0x062c, 0x0645, 0x0649, 0x0000, 0x0633, 0x062e, 0x0649, 0x0000, + 0x0635, 0x062d, 0x064a, 0x0000, 0x0634, 0x062d, 0x064a, 0x0000, + 0x0636, 0x062d, 0x064a, 0x0000, 0x0644, 0x062c, 0x064a, 0x0000, + 0x0644, 0x0645, 0x064a, 0x0000, 0x064a, 0x062d, 0x064a, 0x0000, + 0x064a, 0x062c, 0x064a, 0x0000, 0x064a, 0x0645, 0x064a, 0x0000, + 0x0645, 0x0645, 0x064a, 0x0000, 0x0642, 0x0645, 0x064a, 0x0000, + 0x0646, 0x062d, 0x064a, 0x0000, 0x0639, 0x0645, 0x064a, 0x0000, + 0x0643, 0x0645, 0x064a, 0x0000, 0x0646, 0x062c, 0x062d, 0x0000, + 0x0645, 0x062e, 0x064a, 0x0000, 0x0644, 0x062c, 0x0645, 0x0000, + 0x0643, 0x0645, 0x0645, 0x0000, 0x062c, 0x062d, 0x064a, 0x0000, + 0x062d, 0x062c, 0x064a, 0x0000, 0x0645, 0x062c, 0x064a, 0x0000, + 0x0641, 0x0645, 0x064a, 0x0000, 0x0628, 0x062d, 0x064a, 0x0000, + 0x0633, 0x062e, 0x064a, 0x0000, 0x0646, 0x062c, 0x064a, 0x0000, + 0x0635, 0x0644, 0x06d2, 0x0000, 0x0642, 0x0644, 0x06d2, 0x0000, + 0x0627, 0x0644, 0x0644, 0x0647, 0x0000, 0x0627, 0x0643, 0x0628, + 0x0631, 0x0000, 0x0645, 0x062d, 0x0645, 0x062f, 0x0000, 0x0635, + 0x0644, 0x0639, 0x0645, 0x0000, 0x0631, 0x0633, 0x0648, 0x0644, + 0x0000, 0x0639, 0x0644, 0x064a, 0x0647, 0x0000, 0x0648, 0x0633, + 0x0644, 0x0645, 0x0000, 0x0635, 0x0644, 0x0649, 0x0000, 0x0635, + 0x0644, 0x0649, 0x0020, 0x0627, 0x0644, 0x0644, 0x0647, 0x0020, + 0x0639, 0x0644, 0x064a, 0x0647, 0x0020, 0x0648, 0x0633, 0x0644, + 0x0645, 0x0000, 0x062c, 0x0644, 0x0020, 0x062c, 0x0644, 0x0627, + 0x0644, 0x0647, 0x0000, 0x0631, 0x06cc, 0x0627, 0x0644, 0x0000, + 0x002c, 0x0000, 0x3001, 0x0000, 0x3002, 0x0000, 0x003a, 0x0000, + 0x0021, 0x0000, 0x003f, 0x0000, 0x3016, 0x0000, 0x3017, 0x0000, + 0x2014, 0x0000, 0x2013, 0x0000, 0x005f, 0x0000, 0x007b, 0x0000, + 0x007d, 0x0000, 0x3014, 0x0000, 0x3015, 0x0000, 0x3010, 0x0000, + 0x3011, 0x0000, 0x300a, 0x0000, 0x300b, 0x0000, 0x300c, 0x0000, + 0x300d, 0x0000, 0x300e, 0x0000, 0x300f, 0x0000, 0x005b, 0x0000, + 0x005d, 0x0000, 0x0023, 0x0000, 0x0026, 0x0000, 0x002a, 0x0000, + 0x002d, 0x0000, 0x003c, 0x0000, 0x003e, 0x0000, 0x005c, 0x0000, + 0x0024, 0x0000, 0x0025, 0x0000, 0x0040, 0x0000, 0x0020, 0x064b, + 0x0000, 0x0640, 0x064b, 0x0000, 0x0020, 0x064c, 0x0000, 0x0020, + 0x064d, 0x0000, 0x0020, 0x064e, 0x0000, 0x0640, 0x064e, 0x0000, + 0x0020, 0x064f, 0x0000, 0x0640, 0x064f, 0x0000, 0x0020, 0x0650, + 0x0000, 0x0640, 0x0650, 0x0000, 0x0020, 0x0651, 0x0000, 0x0640, + 0x0651, 0x0000, 0x0020, 0x0652, 0x0000, 0x0640, 0x0652, 0x0000, + 0x0621, 0x0000, 0x0627, 0x0000, 0x0628, 0x0000, 0x0629, 0x0000, + 0x062a, 0x0000, 0x062b, 0x0000, 0x062c, 0x0000, 0x062d, 0x0000, + 0x062e, 0x0000, 0x062f, 0x0000, 0x0630, 0x0000, 0x0631, 0x0000, + 0x0632, 0x0000, 0x0633, 0x0000, 0x0634, 0x0000, 0x0635, 0x0000, + 0x0636, 0x0000, 0x0637, 0x0000, 0x0638, 0x0000, 0x0639, 0x0000, + 0x063a, 0x0000, 0x0641, 0x0000, 0x0642, 0x0000, 0x0643, 0x0000, + 0x0644, 0x0000, 0x0645, 0x0000, 0x0646, 0x0000, 0x0647, 0x0000, + 0x0648, 0x0000, 0x064a, 0x0000, 0x0644, 0x0627, 0x0653, 0x0000, + 0x0644, 0x0627, 0x0654, 0x0000, 0x0644, 0x0627, 0x0655, 0x0000, + 0x0644, 0x0627, 0x0000, 0x0022, 0x0000, 0x0027, 0x0000, 0x002f, + 0x0000, 0x005e, 0x0000, 0x007c, 0x0000, 0x007e, 0x0000, 0x2985, + 0x0000, 0x2986, 0x0000, 0x30fb, 0x0000, 0x30a1, 0x0000, 0x30a3, + 0x0000, 0x30a5, 0x0000, 0x30a7, 0x0000, 0x30a9, 0x0000, 0x30e3, + 0x0000, 0x30e5, 0x0000, 0x30e7, 0x0000, 0x30c3, 0x0000, 0x30fc, + 0x0000, 0x30f3, 0x0000, 0x3099, 0x0000, 0x309a, 0x0000, 0x00a2, + 0x0000, 0x00a3, 0x0000, 0x00ac, 0x0000, 0x00a6, 0x0000, 0x00a5, + 0x0000, 0x20a9, 0x0000, 0x2502, 0x0000, 0x2190, 0x0000, 0x2191, + 0x0000, 0x2192, 0x0000, 0x2193, 0x0000, 0x25a0, 0x0000, 0x25cb, + 0x0000, 0xd804, 0xdc99, 0xd804, 0xdcba, 0x0000, 0xd804, 0xdc9b, + 0xd804, 0xdcba, 0x0000, 0xd804, 0xdca5, 0xd804, 0xdcba, 0x0000, + 0xd804, 0xdd31, 0xd804, 0xdd27, 0x0000, 0xd804, 0xdd32, 0xd804, + 0xdd27, 0x0000, 0xd804, 0xdf47, 0xd804, 0xdf3e, 0x0000, 0xd804, + 0xdf47, 0xd804, 0xdf57, 0x0000, 0xd805, 0xdcb9, 0xd805, 0xdcba, + 0x0000, 0xd805, 0xdcb9, 0xd805, 0xdcb0, 0x0000, 0xd805, 0xdcb9, + 0xd805, 0xdcbd, 0x0000, 0xd805, 0xddb8, 0xd805, 0xddaf, 0x0000, + 0xd805, 0xddb9, 0xd805, 0xddaf, 0x0000, 0xd834, 0xdd57, 0xd834, + 0xdd65, 0x0000, 0xd834, 0xdd58, 0xd834, 0xdd65, 0x0000, 0xd834, + 0xdd58, 0xd834, 0xdd65, 0xd834, 0xdd6e, 0x0000, 0xd834, 0xdd58, + 0xd834, 0xdd65, 0xd834, 0xdd6f, 0x0000, 0xd834, 0xdd58, 0xd834, + 0xdd65, 0xd834, 0xdd70, 0x0000, 0xd834, 0xdd58, 0xd834, 0xdd65, + 0xd834, 0xdd71, 0x0000, 0xd834, 0xdd58, 0xd834, 0xdd65, 0xd834, + 0xdd72, 0x0000, 0xd834, 0xddb9, 0xd834, 0xdd65, 0x0000, 0xd834, + 0xddba, 0xd834, 0xdd65, 0x0000, 0xd834, 0xddb9, 0xd834, 0xdd65, + 0xd834, 0xdd6e, 0x0000, 0xd834, 0xddba, 0xd834, 0xdd65, 0xd834, + 0xdd6e, 0x0000, 0xd834, 0xddb9, 0xd834, 0xdd65, 0xd834, 0xdd6f, + 0x0000, 0xd834, 0xddba, 0xd834, 0xdd65, 0xd834, 0xdd6f, 0x0000, + 0x0131, 0x0000, 0x0237, 0x0000, 0x0391, 0x0000, 0x0392, 0x0000, + 0x0394, 0x0000, 0x0395, 0x0000, 0x0396, 0x0000, 0x0397, 0x0000, + 0x0399, 0x0000, 0x039a, 0x0000, 0x039b, 0x0000, 0x039c, 0x0000, + 0x039d, 0x0000, 0x039e, 0x0000, 0x039f, 0x0000, 0x03a1, 0x0000, + 0x03a4, 0x0000, 0x03a6, 0x0000, 0x03a7, 0x0000, 0x03a8, 0x0000, + 0x2207, 0x0000, 0x03b1, 0x0000, 0x03b6, 0x0000, 0x03b7, 0x0000, + 0x03bb, 0x0000, 0x03bd, 0x0000, 0x03be, 0x0000, 0x03bf, 0x0000, + 0x03c3, 0x0000, 0x03c4, 0x0000, 0x03c5, 0x0000, 0x03c8, 0x0000, + 0x03c9, 0x0000, 0x2202, 0x0000, 0x03dc, 0x0000, 0x03dd, 0x0000, + 0x066e, 0x0000, 0x06a1, 0x0000, 0x066f, 0x0000, 0x0030, 0x002e, + 0x0000, 0x0030, 0x002c, 0x0000, 0x0031, 0x002c, 0x0000, 0x0032, + 0x002c, 0x0000, 0x0033, 0x002c, 0x0000, 0x0034, 0x002c, 0x0000, + 0x0035, 0x002c, 0x0000, 0x0036, 0x002c, 0x0000, 0x0037, 0x002c, + 0x0000, 0x0038, 0x002c, 0x0000, 0x0039, 0x002c, 0x0000, 0x0028, + 0x0041, 0x0029, 0x0000, 0x0028, 0x0042, 0x0029, 0x0000, 0x0028, + 0x0043, 0x0029, 0x0000, 0x0028, 0x0044, 0x0029, 0x0000, 0x0028, + 0x0045, 0x0029, 0x0000, 0x0028, 0x0046, 0x0029, 0x0000, 0x0028, + 0x0047, 0x0029, 0x0000, 0x0028, 0x0048, 0x0029, 0x0000, 0x0028, + 0x0049, 0x0029, 0x0000, 0x0028, 0x004a, 0x0029, 0x0000, 0x0028, + 0x004b, 0x0029, 0x0000, 0x0028, 0x004c, 0x0029, 0x0000, 0x0028, + 0x004d, 0x0029, 0x0000, 0x0028, 0x004e, 0x0029, 0x0000, 0x0028, + 0x004f, 0x0029, 0x0000, 0x0028, 0x0050, 0x0029, 0x0000, 0x0028, + 0x0051, 0x0029, 0x0000, 0x0028, 0x0052, 0x0029, 0x0000, 0x0028, + 0x0053, 0x0029, 0x0000, 0x0028, 0x0054, 0x0029, 0x0000, 0x0028, + 0x0055, 0x0029, 0x0000, 0x0028, 0x0056, 0x0029, 0x0000, 0x0028, + 0x0057, 0x0029, 0x0000, 0x0028, 0x0058, 0x0029, 0x0000, 0x0028, + 0x0059, 0x0029, 0x0000, 0x0028, 0x005a, 0x0029, 0x0000, 0x3014, + 0x0053, 0x3015, 0x0000, 0x0043, 0x0044, 0x0000, 0x0057, 0x005a, + 0x0000, 0x0048, 0x0056, 0x0000, 0x0053, 0x0044, 0x0000, 0x0053, + 0x0053, 0x0000, 0x0050, 0x0050, 0x0056, 0x0000, 0x0057, 0x0043, + 0x0000, 0x004d, 0x0043, 0x0000, 0x004d, 0x0044, 0x0000, 0x0044, + 0x004a, 0x0000, 0x307b, 0x304b, 0x0000, 0x30b3, 0x30b3, 0x0000, + 0x5b57, 0x0000, 0x53cc, 0x0000, 0x591a, 0x0000, 0x89e3, 0x0000, + 0x4ea4, 0x0000, 0x6620, 0x0000, 0x7121, 0x0000, 0x524d, 0x0000, + 0x5f8c, 0x0000, 0x518d, 0x0000, 0x65b0, 0x0000, 0x521d, 0x0000, + 0x7d42, 0x0000, 0x8ca9, 0x0000, 0x58f0, 0x0000, 0x5439, 0x0000, + 0x6f14, 0x0000, 0x6295, 0x0000, 0x6355, 0x0000, 0x904a, 0x0000, + 0x6307, 0x0000, 0x6253, 0x0000, 0x7981, 0x0000, 0x7a7a, 0x0000, + 0x5408, 0x0000, 0x6e80, 0x0000, 0x7533, 0x0000, 0x5272, 0x0000, + 0x55b6, 0x0000, 0x914d, 0x0000, 0x3014, 0x672c, 0x3015, 0x0000, + 0x3014, 0x4e09, 0x3015, 0x0000, 0x3014, 0x4e8c, 0x3015, 0x0000, + 0x3014, 0x5b89, 0x3015, 0x0000, 0x3014, 0x70b9, 0x3015, 0x0000, + 0x3014, 0x6253, 0x3015, 0x0000, 0x3014, 0x76d7, 0x3015, 0x0000, + 0x3014, 0x52dd, 0x3015, 0x0000, 0x3014, 0x6557, 0x3015, 0x0000, + 0x5f97, 0x0000, 0x53ef, 0x0000, 0x4e3d, 0x0000, 0x4e38, 0x0000, + 0x4e41, 0x0000, 0xd840, 0xdd22, 0x0000, 0x4f60, 0x0000, 0x4fbb, + 0x0000, 0x5002, 0x0000, 0x507a, 0x0000, 0x5099, 0x0000, 0x50cf, + 0x0000, 0x349e, 0x0000, 0xd841, 0xde3a, 0x0000, 0x5154, 0x0000, + 0x5164, 0x0000, 0x5177, 0x0000, 0xd841, 0xdd1c, 0x0000, 0x34b9, + 0x0000, 0x5167, 0x0000, 0xd841, 0xdd4b, 0x0000, 0x5197, 0x0000, + 0x51a4, 0x0000, 0x4ecc, 0x0000, 0x51ac, 0x0000, 0xd864, 0xdddf, + 0x0000, 0x5203, 0x0000, 0x34df, 0x0000, 0x523b, 0x0000, 0x5246, + 0x0000, 0x5277, 0x0000, 0x3515, 0x0000, 0x5305, 0x0000, 0x5306, + 0x0000, 0x5349, 0x0000, 0x535a, 0x0000, 0x5373, 0x0000, 0x537d, + 0x0000, 0x537f, 0x0000, 0xd842, 0xde2c, 0x0000, 0x7070, 0x0000, + 0x53ca, 0x0000, 0x53df, 0x0000, 0xd842, 0xdf63, 0x0000, 0x53eb, + 0x0000, 0x53f1, 0x0000, 0x5406, 0x0000, 0x549e, 0x0000, 0x5438, + 0x0000, 0x5448, 0x0000, 0x5468, 0x0000, 0x54a2, 0x0000, 0x54f6, + 0x0000, 0x5510, 0x0000, 0x5553, 0x0000, 0x5563, 0x0000, 0x5584, + 0x0000, 0x55ab, 0x0000, 0x55b3, 0x0000, 0x55c2, 0x0000, 0x5716, + 0x0000, 0x5717, 0x0000, 0x5651, 0x0000, 0x5674, 0x0000, 0x58ee, + 0x0000, 0x57ce, 0x0000, 0x57f4, 0x0000, 0x580d, 0x0000, 0x578b, + 0x0000, 0x5832, 0x0000, 0x5831, 0x0000, 0x58ac, 0x0000, 0xd845, + 0xdce4, 0x0000, 0x58f2, 0x0000, 0x58f7, 0x0000, 0x5906, 0x0000, + 0x5922, 0x0000, 0x5962, 0x0000, 0xd845, 0xdea8, 0x0000, 0xd845, + 0xdeea, 0x0000, 0x59ec, 0x0000, 0x5a1b, 0x0000, 0x5a27, 0x0000, + 0x59d8, 0x0000, 0x5a66, 0x0000, 0x36ee, 0x0000, 0x36fc, 0x0000, + 0x5b08, 0x0000, 0x5b3e, 0x0000, 0xd846, 0xddc8, 0x0000, 0x5bc3, + 0x0000, 0x5bd8, 0x0000, 0x5bf3, 0x0000, 0xd846, 0xdf18, 0x0000, + 0x5bff, 0x0000, 0x5c06, 0x0000, 0x5f53, 0x0000, 0x3781, 0x0000, + 0x5c60, 0x0000, 0x5cc0, 0x0000, 0x5c8d, 0x0000, 0xd847, 0xdde4, + 0x0000, 0x5d43, 0x0000, 0xd847, 0xdde6, 0x0000, 0x5d6e, 0x0000, + 0x5d6b, 0x0000, 0x5d7c, 0x0000, 0x5de1, 0x0000, 0x5de2, 0x0000, + 0x382f, 0x0000, 0x5dfd, 0x0000, 0x5e28, 0x0000, 0x5e3d, 0x0000, + 0x5e69, 0x0000, 0x3862, 0x0000, 0xd848, 0xdd83, 0x0000, 0x387c, + 0x0000, 0x5eb0, 0x0000, 0x5eb3, 0x0000, 0x5eb6, 0x0000, 0xd868, + 0xdf92, 0x0000, 0xd848, 0xdf31, 0x0000, 0x8201, 0x0000, 0x5f22, + 0x0000, 0x38c7, 0x0000, 0xd84c, 0xdeb8, 0x0000, 0xd858, 0xddda, + 0x0000, 0x5f62, 0x0000, 0x5f6b, 0x0000, 0x38e3, 0x0000, 0x5f9a, + 0x0000, 0x5fcd, 0x0000, 0x5fd7, 0x0000, 0x5ff9, 0x0000, 0x6081, + 0x0000, 0x393a, 0x0000, 0x391c, 0x0000, 0xd849, 0xded4, 0x0000, + 0x60c7, 0x0000, 0x6148, 0x0000, 0x614c, 0x0000, 0x617a, 0x0000, + 0x61b2, 0x0000, 0x61a4, 0x0000, 0x61af, 0x0000, 0x61de, 0x0000, + 0x6210, 0x0000, 0x621b, 0x0000, 0x625d, 0x0000, 0x62b1, 0x0000, + 0x62d4, 0x0000, 0x6350, 0x0000, 0xd84a, 0xdf0c, 0x0000, 0x633d, + 0x0000, 0x62fc, 0x0000, 0x6368, 0x0000, 0x6383, 0x0000, 0x63e4, + 0x0000, 0xd84a, 0xdff1, 0x0000, 0x6422, 0x0000, 0x63c5, 0x0000, + 0x63a9, 0x0000, 0x3a2e, 0x0000, 0x6469, 0x0000, 0x647e, 0x0000, + 0x649d, 0x0000, 0x6477, 0x0000, 0x3a6c, 0x0000, 0x656c, 0x0000, + 0xd84c, 0xdc0a, 0x0000, 0x65e3, 0x0000, 0x66f8, 0x0000, 0x6649, + 0x0000, 0x3b19, 0x0000, 0x3b08, 0x0000, 0x3ae4, 0x0000, 0x5192, + 0x0000, 0x5195, 0x0000, 0x6700, 0x0000, 0x669c, 0x0000, 0x80ad, + 0x0000, 0x43d9, 0x0000, 0x6721, 0x0000, 0x675e, 0x0000, 0x6753, + 0x0000, 0xd84c, 0xdfc3, 0x0000, 0x3b49, 0x0000, 0x67fa, 0x0000, + 0x6785, 0x0000, 0x6852, 0x0000, 0xd84d, 0xdc6d, 0x0000, 0x688e, + 0x0000, 0x681f, 0x0000, 0x6914, 0x0000, 0x6942, 0x0000, 0x69a3, + 0x0000, 0x69ea, 0x0000, 0x6aa8, 0x0000, 0xd84d, 0xdea3, 0x0000, + 0x6adb, 0x0000, 0x3c18, 0x0000, 0x6b21, 0x0000, 0xd84e, 0xdca7, + 0x0000, 0x6b54, 0x0000, 0x3c4e, 0x0000, 0x6b72, 0x0000, 0x6b9f, + 0x0000, 0x6bbb, 0x0000, 0xd84e, 0xde8d, 0x0000, 0xd847, 0xdd0b, + 0x0000, 0xd84e, 0xdefa, 0x0000, 0x6c4e, 0x0000, 0xd84f, 0xdcbc, + 0x0000, 0x6cbf, 0x0000, 0x6ccd, 0x0000, 0x6c67, 0x0000, 0x6d16, + 0x0000, 0x6d3e, 0x0000, 0x6d69, 0x0000, 0x6d78, 0x0000, 0x6d85, + 0x0000, 0xd84f, 0xdd1e, 0x0000, 0x6d34, 0x0000, 0x6e2f, 0x0000, + 0x6e6e, 0x0000, 0x3d33, 0x0000, 0x6ec7, 0x0000, 0xd84f, 0xded1, + 0x0000, 0x6df9, 0x0000, 0x6f6e, 0x0000, 0xd84f, 0xdf5e, 0x0000, + 0xd84f, 0xdf8e, 0x0000, 0x6fc6, 0x0000, 0x7039, 0x0000, 0x701b, + 0x0000, 0x3d96, 0x0000, 0x704a, 0x0000, 0x707d, 0x0000, 0x7077, + 0x0000, 0x70ad, 0x0000, 0xd841, 0xdd25, 0x0000, 0x7145, 0x0000, + 0xd850, 0xde63, 0x0000, 0x719c, 0x0000, 0xd850, 0xdfab, 0x0000, + 0x7228, 0x0000, 0x7250, 0x0000, 0xd851, 0xde08, 0x0000, 0x7280, + 0x0000, 0x7295, 0x0000, 0xd851, 0xdf35, 0x0000, 0xd852, 0xdc14, + 0x0000, 0x737a, 0x0000, 0x738b, 0x0000, 0x3eac, 0x0000, 0x73a5, + 0x0000, 0x3eb8, 0x0000, 0x7447, 0x0000, 0x745c, 0x0000, 0x7485, + 0x0000, 0x74ca, 0x0000, 0x3f1b, 0x0000, 0x7524, 0x0000, 0xd853, + 0xdc36, 0x0000, 0x753e, 0x0000, 0xd853, 0xdc92, 0x0000, 0xd848, + 0xdd9f, 0x0000, 0x7610, 0x0000, 0xd853, 0xdfa1, 0x0000, 0xd853, + 0xdfb8, 0x0000, 0xd854, 0xdc44, 0x0000, 0x3ffc, 0x0000, 0x4008, + 0x0000, 0xd854, 0xdcf3, 0x0000, 0xd854, 0xdcf2, 0x0000, 0xd854, + 0xdd19, 0x0000, 0xd854, 0xdd33, 0x0000, 0x771e, 0x0000, 0x771f, + 0x0000, 0x778b, 0x0000, 0x4046, 0x0000, 0x4096, 0x0000, 0xd855, + 0xdc1d, 0x0000, 0x784e, 0x0000, 0x40e3, 0x0000, 0xd855, 0xde26, + 0x0000, 0xd855, 0xde9a, 0x0000, 0xd855, 0xdec5, 0x0000, 0x79eb, + 0x0000, 0x412f, 0x0000, 0x7a4a, 0x0000, 0x7a4f, 0x0000, 0xd856, + 0xdd7c, 0x0000, 0xd856, 0xdea7, 0x0000, 0x7aee, 0x0000, 0x4202, + 0x0000, 0xd856, 0xdfab, 0x0000, 0x7bc6, 0x0000, 0x7bc9, 0x0000, + 0x4227, 0x0000, 0xd857, 0xdc80, 0x0000, 0x7cd2, 0x0000, 0x42a0, + 0x0000, 0x7ce8, 0x0000, 0x7ce3, 0x0000, 0x7d00, 0x0000, 0xd857, + 0xdf86, 0x0000, 0x7d63, 0x0000, 0x4301, 0x0000, 0x7dc7, 0x0000, + 0x7e02, 0x0000, 0x7e45, 0x0000, 0x4334, 0x0000, 0xd858, 0xde28, + 0x0000, 0xd858, 0xde47, 0x0000, 0x4359, 0x0000, 0xd858, 0xded9, + 0x0000, 0x7f7a, 0x0000, 0xd858, 0xdf3e, 0x0000, 0x7f95, 0x0000, + 0x7ffa, 0x0000, 0xd859, 0xdcda, 0x0000, 0xd859, 0xdd23, 0x0000, + 0x8060, 0x0000, 0xd859, 0xdda8, 0x0000, 0x8070, 0x0000, 0xd84c, + 0xdf5f, 0x0000, 0x43d5, 0x0000, 0x80b2, 0x0000, 0x8103, 0x0000, + 0x440b, 0x0000, 0x813e, 0x0000, 0x5ab5, 0x0000, 0xd859, 0xdfa7, + 0x0000, 0xd859, 0xdfb5, 0x0000, 0xd84c, 0xdf93, 0x0000, 0xd84c, + 0xdf9c, 0x0000, 0x8204, 0x0000, 0x8f9e, 0x0000, 0x446b, 0x0000, + 0x8291, 0x0000, 0x828b, 0x0000, 0x829d, 0x0000, 0x52b3, 0x0000, + 0x82b1, 0x0000, 0x82b3, 0x0000, 0x82bd, 0x0000, 0x82e6, 0x0000, + 0xd85a, 0xdf3c, 0x0000, 0x831d, 0x0000, 0x8363, 0x0000, 0x83ad, + 0x0000, 0x8323, 0x0000, 0x83bd, 0x0000, 0x83e7, 0x0000, 0x8353, + 0x0000, 0x83ca, 0x0000, 0x83cc, 0x0000, 0x83dc, 0x0000, 0xd85b, + 0xdc36, 0x0000, 0xd85b, 0xdd6b, 0x0000, 0xd85b, 0xdcd5, 0x0000, + 0x452b, 0x0000, 0x84f1, 0x0000, 0x84f3, 0x0000, 0x8516, 0x0000, + 0xd85c, 0xdfca, 0x0000, 0x8564, 0x0000, 0xd85b, 0xdf2c, 0x0000, + 0x455d, 0x0000, 0x4561, 0x0000, 0xd85b, 0xdfb1, 0x0000, 0xd85c, + 0xdcd2, 0x0000, 0x456b, 0x0000, 0x8650, 0x0000, 0x8667, 0x0000, + 0x8669, 0x0000, 0x86a9, 0x0000, 0x8688, 0x0000, 0x870e, 0x0000, + 0x86e2, 0x0000, 0x8728, 0x0000, 0x876b, 0x0000, 0x8786, 0x0000, + 0x45d7, 0x0000, 0x87e1, 0x0000, 0x8801, 0x0000, 0x45f9, 0x0000, + 0x8860, 0x0000, 0xd85d, 0xde67, 0x0000, 0x88d7, 0x0000, 0x88de, + 0x0000, 0x4635, 0x0000, 0x88fa, 0x0000, 0x34bb, 0x0000, 0xd85e, + 0xdcae, 0x0000, 0xd85e, 0xdd66, 0x0000, 0x46be, 0x0000, 0x46c7, + 0x0000, 0x8aa0, 0x0000, 0xd85f, 0xdca8, 0x0000, 0x8cab, 0x0000, + 0x8cc1, 0x0000, 0x8d1b, 0x0000, 0x8d77, 0x0000, 0xd85f, 0xdf2f, + 0x0000, 0xd842, 0xdc04, 0x0000, 0x8dcb, 0x0000, 0x8dbc, 0x0000, + 0x8df0, 0x0000, 0xd842, 0xdcde, 0x0000, 0x8ed4, 0x0000, 0xd861, + 0xddd2, 0x0000, 0xd861, 0xdded, 0x0000, 0x9094, 0x0000, 0x90f1, + 0x0000, 0x9111, 0x0000, 0xd861, 0xdf2e, 0x0000, 0x911b, 0x0000, + 0x9238, 0x0000, 0x92d7, 0x0000, 0x92d8, 0x0000, 0x927c, 0x0000, + 0x93f9, 0x0000, 0x9415, 0x0000, 0xd862, 0xdffa, 0x0000, 0x958b, + 0x0000, 0x4995, 0x0000, 0x95b7, 0x0000, 0xd863, 0xdd77, 0x0000, + 0x49e6, 0x0000, 0x96c3, 0x0000, 0x5db2, 0x0000, 0x9723, 0x0000, + 0xd864, 0xdd45, 0x0000, 0xd864, 0xde1a, 0x0000, 0x4a6e, 0x0000, + 0x4a76, 0x0000, 0x97e0, 0x0000, 0xd865, 0xdc0a, 0x0000, 0x4ab2, + 0x0000, 0xd865, 0xdc96, 0x0000, 0x9829, 0x0000, 0xd865, 0xddb6, + 0x0000, 0x98e2, 0x0000, 0x4b33, 0x0000, 0x9929, 0x0000, 0x99a7, + 0x0000, 0x99c2, 0x0000, 0x99fe, 0x0000, 0x4bce, 0x0000, 0xd866, + 0xdf30, 0x0000, 0x9c40, 0x0000, 0x9cfd, 0x0000, 0x4cce, 0x0000, + 0x4ced, 0x0000, 0x9d67, 0x0000, 0xd868, 0xdcce, 0x0000, 0x4cf8, + 0x0000, 0xd868, 0xdd05, 0x0000, 0xd868, 0xde0e, 0x0000, 0xd868, + 0xde91, 0x0000, 0x4d56, 0x0000, 0x9efe, 0x0000, 0x9f05, 0x0000, + 0x9f0f, 0x0000, 0x9f16, 0x0000, 0xd869, 0xde00, 0x0000 +}; + +static const BYTE idx1_decomp[763] = +{ + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, + 0x00, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, + 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x11, 0x12, 0x13, + 0x14, 0x15, 0x16, 0x17, 0x18, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x19, 0x00, 0x1a, 0x1b, 0x1c, 0x1d, + 0x1e, 0x1f, 0x20, 0x21, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x23, + 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2c, 0x2d, 0x00, 0x2e, 0x2f, 0x30, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x31, 0x00, 0x00, 0x32, 0x33, 0x34, 0x35, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, + 0x00, 0x37, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x39, 0x3a, 0x3b +}; + +static const USHORT idx2_decomp[960] = { - /* index */ - 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0100, 0x0160, 0x0100, - 0x0100, 0x0170, 0x0180, 0x0190, 0x01a0, 0x01b0, 0x0100, 0x01c0, - 0x01d0, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x01e0, 0x0100, 0x0100, 0x01f0, 0x0200, - 0x0100, 0x0210, 0x0220, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0230, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0240, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0250, 0x0100, 0x0100, 0x0100, 0x0100, /* null sub-index */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 00 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0280, 0x02a0, 0x02c0, 0x02e0, - /* sub-index 01 */ - 0x0300, 0x0320, 0x0340, 0x0360, 0x0380, 0x03a0, 0x03c0, 0x03e0, - 0x0260, 0x0260, 0x0400, 0x0420, 0x0440, 0x0460, 0x0480, 0x04a0, - /* sub-index 02 */ - 0x04c0, 0x04e0, 0x0500, 0x0520, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 03 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0540, 0x0260, 0x0260, 0x0260, - 0x0560, 0x0580, 0x05a0, 0x05c0, 0x05e0, 0x0600, 0x0260, 0x0260, - /* sub-index 04 */ - 0x0620, 0x0640, 0x0260, 0x0660, 0x0260, 0x0680, 0x0260, 0x06a0, - 0x0260, 0x0260, 0x0260, 0x0260, 0x06c0, 0x06e0, 0x0700, 0x0720, - /* sub-index 06 */ - 0x0260, 0x0260, 0x0740, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0760, 0x0780, 0x0260, 0x0260, - /* sub-index 09 */ - 0x0260, 0x0260, 0x07a0, 0x07c0, 0x0260, 0x07e0, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0800, 0x0820, 0x0260, 0x0260, - /* sub-index 0a */ - 0x0260, 0x0260, 0x0260, 0x0840, 0x0260, 0x0860, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 0b */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0880, 0x08a0, 0x0260, 0x0260, - 0x0260, 0x08c0, 0x0260, 0x0260, 0x08e0, 0x0260, 0x0260, 0x0260, - /* sub-index 0c */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0900, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0920, 0x0260, 0x0260, 0x0260, - /* sub-index 0d */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0940, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0960, 0x0260, 0x0260, - /* sub-index 0f */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0980, 0x09a0, 0x09c0, 0x09e0, - 0x0a00, 0x0a20, 0x0a40, 0x0a60, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 10 */ - 0x0260, 0x0260, 0x0a80, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 1b */ - 0x0aa0, 0x0ac0, 0x0260, 0x0ae0, 0x0b00, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* sub-index 1e */ - 0x0b20, 0x0b40, 0x0b60, 0x0b80, 0x0ba0, 0x0bc0, 0x0be0, 0x0c00, - 0x0c20, 0x0c40, 0x0c60, 0x0c80, 0x0ca0, 0x0cc0, 0x0ce0, 0x0d00, - /* sub-index 1f */ - 0x0d20, 0x0d40, 0x0d60, 0x0d80, 0x0da0, 0x0dc0, 0x0de0, 0x0e00, - 0x0e20, 0x0e40, 0x0e60, 0x0e80, 0x0ea0, 0x0ec0, 0x0ee0, 0x0f00, - /* sub-index 21 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0f20, 0x0f40, 0x0260, 0x0f60, 0x0260, 0x0260, 0x0260, - /* sub-index 22 */ - 0x0f80, 0x0260, 0x0fa0, 0x0260, 0x0fc0, 0x0260, 0x0fe0, 0x1000, - 0x1020, 0x0260, 0x1040, 0x0260, 0x0260, 0x0260, 0x1060, 0x0260, - /* sub-index 2a */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x1080, 0x0260, 0x0260, - /* sub-index 30 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x10a0, 0x10c0, 0x10e0, 0x1100, - 0x0260, 0x1120, 0x1140, 0x1160, 0x1180, 0x11a0, 0x0260, 0x11c0, - /* sub-index fb */ - 0x0260, 0x11e0, 0x1200, 0x1220, 0x1240, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - /* null mapping */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x01 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, + /* sub-index 0x02 */ + 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, + 0x0000, 0x0000, 0x000f, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, + /* sub-index 0x03 */ + 0x0015, 0x0016, 0x0017, 0x0018, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0019, 0x0000, 0x001a, 0x001b, 0x0000, + /* sub-index 0x04 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x001c, 0x0000, 0x0000, 0x001d, + 0x001e, 0x001f, 0x0020, 0x0021, 0x0022, 0x0023, 0x0000, 0x0024, + /* sub-index 0x05 */ + 0x0025, 0x0026, 0x0000, 0x0027, 0x0000, 0x0028, 0x0000, 0x0029, + 0x0000, 0x0000, 0x0000, 0x0000, 0x002a, 0x002b, 0x002c, 0x002d, + /* sub-index 0x06 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x002e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x07 */ + 0x0000, 0x0000, 0x002f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0030, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0032, 0x0000, 0x0000, + /* sub-index 0x08 */ + 0x0000, 0x0000, 0x0033, 0x0034, 0x0000, 0x0035, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0036, 0x0037, 0x0000, 0x0000, + /* sub-index 0x09 */ + 0x0000, 0x0000, 0x0000, 0x0038, 0x0000, 0x0039, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x0a */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x003a, 0x003b, 0x0000, 0x0000, + 0x0000, 0x003c, 0x0000, 0x0000, 0x003d, 0x0000, 0x0000, 0x0000, + /* sub-index 0x0b */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x003e, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x003f, 0x0000, 0x0000, 0x0000, + /* sub-index 0x0c */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0040, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0041, 0x0000, 0x0000, + /* sub-index 0x0d */ + 0x0000, 0x0000, 0x0000, 0x0042, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0043, 0x0000, 0x0044, 0x0000, 0x0000, + /* sub-index 0x0e */ + 0x0045, 0x0000, 0x0000, 0x0000, 0x0046, 0x0047, 0x0048, 0x0049, + 0x004a, 0x004b, 0x004c, 0x004d, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x0f */ + 0x0000, 0x0000, 0x004e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x004f, + /* sub-index 0x10 */ + 0x0050, 0x0051, 0x0000, 0x0052, 0x0053, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x11 */ + 0x0000, 0x0000, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, + 0x0000, 0x005a, 0x005b, 0x005c, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x12 */ + 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, + 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, + /* sub-index 0x13 */ + 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, + 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, + /* sub-index 0x14 */ + 0x007d, 0x007e, 0x007f, 0x0080, 0x0081, 0x0082, 0x0000, 0x0083, + 0x0084, 0x0085, 0x0086, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x15 */ + 0x0087, 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, + 0x008f, 0x0090, 0x0091, 0x0000, 0x0092, 0x0000, 0x0000, 0x0000, + /* sub-index 0x16 */ + 0x0093, 0x0000, 0x0094, 0x0095, 0x0096, 0x0000, 0x0097, 0x0098, + 0x0099, 0x0000, 0x009a, 0x0000, 0x0000, 0x0000, 0x009b, 0x0000, + /* sub-index 0x17 */ + 0x0000, 0x0000, 0x009c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x18 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x009d, 0x009e, + 0x009f, 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x0000, + /* sub-index 0x19 */ + 0x00a6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00a7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00a8, 0x0000, 0x0000, + /* sub-index 0x1a */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00a9, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x1b */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00aa, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x1c */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00ab, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00ac, + /* sub-index 0x1d */ + 0x00ad, 0x00ae, 0x00af, 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, + 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x0000, 0x0000, + /* sub-index 0x1e */ + 0x00bb, 0x0000, 0x0000, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0x00c0, + 0x0000, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x0000, 0x00c6, + /* sub-index 0x1f */ + 0x0000, 0x0000, 0x0000, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, + 0x00cc, 0x00cd, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x20 */ + 0x00ce, 0x00cf, 0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, + 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, + /* sub-index 0x21 */ + 0x00de, 0x00df, 0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, + 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, + /* sub-index 0x22 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00ee, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x23 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00ef, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f0, + /* sub-index 0x24 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f1, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x25 */ + 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, + 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff, 0x0100, 0x0101, + /* sub-index 0x26 */ + 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, 0x0108, 0x0109, + 0x010a, 0x010b, 0x010c, 0x010d, 0x010e, 0x010f, 0x0000, 0x0000, + /* sub-index 0x27 */ + 0x0110, 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, + 0x0118, 0x0119, 0x011a, 0x011b, 0x0000, 0x011c, 0x011d, 0x011e, + /* sub-index 0x28 */ + 0x011f, 0x0120, 0x0121, 0x0122, 0x0123, 0x0124, 0x0125, 0x0126, + 0x0127, 0x0128, 0x0129, 0x012a, 0x012b, 0x012c, 0x012d, 0x012e, + /* sub-index 0x29 */ + 0x012f, 0x0130, 0x0131, 0x0132, 0x0000, 0x0133, 0x0134, 0x0135, + 0x0136, 0x0137, 0x0138, 0x0139, 0x013a, 0x0000, 0x0000, 0x013b, + /* sub-index 0x2a */ + 0x0000, 0x013c, 0x0000, 0x013d, 0x013e, 0x013f, 0x0140, 0x0141, + 0x0142, 0x0143, 0x0144, 0x0145, 0x0146, 0x0147, 0x0148, 0x0149, + /* sub-index 0x2b */ + 0x014a, 0x014b, 0x014c, 0x014d, 0x014e, 0x014f, 0x0150, 0x0151, + 0x0152, 0x0153, 0x0154, 0x0155, 0x0156, 0x0157, 0x0158, 0x0000, + /* sub-index 0x2c */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0159, 0x015a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x2d */ + 0x0000, 0x0000, 0x015b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x2e */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x015c, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x2f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x015d, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x30 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x015e, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x31 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x015f, 0x0160, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0161, 0x0162, 0x0000, 0x0000, 0x0000, + /* sub-index 0x32 */ + 0x0163, 0x0164, 0x0165, 0x0166, 0x0167, 0x0168, 0x0169, 0x016a, + 0x016b, 0x016c, 0x016d, 0x016e, 0x016f, 0x0170, 0x0171, 0x0172, + /* sub-index 0x33 */ + 0x0173, 0x0174, 0x0175, 0x0176, 0x0177, 0x0178, 0x0179, 0x017a, + 0x017b, 0x017c, 0x017d, 0x017e, 0x017f, 0x0180, 0x0181, 0x0182, + /* sub-index 0x34 */ + 0x0183, 0x0184, 0x0185, 0x0186, 0x0187, 0x0188, 0x0189, 0x018a, + 0x018b, 0x018c, 0x018d, 0x018e, 0x018f, 0x0190, 0x0191, 0x0192, + /* sub-index 0x35 */ + 0x0193, 0x0194, 0x0195, 0x0196, 0x0197, 0x0198, 0x0199, 0x019a, + 0x019b, 0x019c, 0x019d, 0x019e, 0x019f, 0x01a0, 0x01a1, 0x01a2, + /* sub-index 0x36 */ + 0x01a3, 0x01a4, 0x01a5, 0x01a6, 0x01a7, 0x01a8, 0x01a9, 0x01aa, + 0x01ab, 0x01ac, 0x01ad, 0x01ae, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x37 */ + 0x01af, 0x01b0, 0x01b1, 0x01b2, 0x01b3, 0x0000, 0x01b4, 0x0000, + 0x0000, 0x01b5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x38 */ + 0x01b6, 0x01b7, 0x01b8, 0x01b9, 0x01ba, 0x01bb, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* sub-index 0x39 */ + 0x01bc, 0x01bd, 0x01be, 0x01bf, 0x01c0, 0x01c1, 0x01c2, 0x01c3, + 0x01c4, 0x01c5, 0x01c6, 0x01c7, 0x01c8, 0x01c9, 0x01ca, 0x01cb, + /* sub-index 0x3a */ + 0x01cc, 0x01cd, 0x01ce, 0x01cf, 0x01d0, 0x01d1, 0x01d2, 0x01d3, + 0x01d4, 0x01d5, 0x01d6, 0x01d7, 0x01d8, 0x01d9, 0x01da, 0x01db, + /* sub-index 0x3b */ + 0x01dc, 0x01dd, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +}; + +static const USHORT offsets_decomp[15296] = +{ + /* (nfd, nfkd) x 16 */ + /* no decomposition */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x00a0 .. 0x00af */ + 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0003, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0008, + /* 0x00b0 .. 0x00bf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000b, 0x0000, 0x000d, + 0x0000, 0x000f, 0x0000, 0x0012, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0014, 0x0000, 0x0017, 0x0000, 0x0019, 0x0000, 0x0000, + 0x0000, 0x001b, 0x0000, 0x001f, 0x0000, 0x0023, 0x0000, 0x0000, /* 0x00c0 .. 0x00cf */ - 0x0041, 0x0300, 0x0041, 0x0301, 0x0041, 0x0302, 0x0041, 0x0303, - 0x0041, 0x0308, 0x0041, 0x030a, 0x0000, 0x0000, 0x0043, 0x0327, - 0x0045, 0x0300, 0x0045, 0x0301, 0x0045, 0x0302, 0x0045, 0x0308, - 0x0049, 0x0300, 0x0049, 0x0301, 0x0049, 0x0302, 0x0049, 0x0308, + 0x0027, 0x0027, 0x002a, 0x002a, 0x002d, 0x002d, 0x0030, 0x0030, + 0x0033, 0x0033, 0x0036, 0x0036, 0x0000, 0x0000, 0x0039, 0x0039, + 0x003c, 0x003c, 0x003f, 0x003f, 0x0042, 0x0042, 0x0045, 0x0045, + 0x0048, 0x0048, 0x004b, 0x004b, 0x004e, 0x004e, 0x0051, 0x0051, /* 0x00d0 .. 0x00df */ - 0x0000, 0x0000, 0x004e, 0x0303, 0x004f, 0x0300, 0x004f, 0x0301, - 0x004f, 0x0302, 0x004f, 0x0303, 0x004f, 0x0308, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0055, 0x0300, 0x0055, 0x0301, 0x0055, 0x0302, - 0x0055, 0x0308, 0x0059, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0054, 0x0054, 0x0057, 0x0057, 0x005a, 0x005a, + 0x005d, 0x005d, 0x0060, 0x0060, 0x0063, 0x0063, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0066, 0x0066, 0x0069, 0x0069, 0x006c, 0x006c, + 0x006f, 0x006f, 0x0072, 0x0072, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x00e0 .. 0x00ef */ - 0x0061, 0x0300, 0x0061, 0x0301, 0x0061, 0x0302, 0x0061, 0x0303, - 0x0061, 0x0308, 0x0061, 0x030a, 0x0000, 0x0000, 0x0063, 0x0327, - 0x0065, 0x0300, 0x0065, 0x0301, 0x0065, 0x0302, 0x0065, 0x0308, - 0x0069, 0x0300, 0x0069, 0x0301, 0x0069, 0x0302, 0x0069, 0x0308, + 0x0075, 0x0075, 0x0078, 0x0078, 0x007b, 0x007b, 0x007e, 0x007e, + 0x0081, 0x0081, 0x0084, 0x0084, 0x0000, 0x0000, 0x0087, 0x0087, + 0x008a, 0x008a, 0x008d, 0x008d, 0x0090, 0x0090, 0x0093, 0x0093, + 0x0096, 0x0096, 0x0099, 0x0099, 0x009c, 0x009c, 0x009f, 0x009f, /* 0x00f0 .. 0x00ff */ - 0x0000, 0x0000, 0x006e, 0x0303, 0x006f, 0x0300, 0x006f, 0x0301, - 0x006f, 0x0302, 0x006f, 0x0303, 0x006f, 0x0308, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0075, 0x0300, 0x0075, 0x0301, 0x0075, 0x0302, - 0x0075, 0x0308, 0x0079, 0x0301, 0x0000, 0x0000, 0x0079, 0x0308, + 0x0000, 0x0000, 0x00a2, 0x00a2, 0x00a5, 0x00a5, 0x00a8, 0x00a8, + 0x00ab, 0x00ab, 0x00ae, 0x00ae, 0x00b1, 0x00b1, 0x0000, 0x0000, + 0x0000, 0x0000, 0x00b4, 0x00b4, 0x00b7, 0x00b7, 0x00ba, 0x00ba, + 0x00bd, 0x00bd, 0x00c0, 0x00c0, 0x0000, 0x0000, 0x00c3, 0x00c3, /* 0x0100 .. 0x010f */ - 0x0041, 0x0304, 0x0061, 0x0304, 0x0041, 0x0306, 0x0061, 0x0306, - 0x0041, 0x0328, 0x0061, 0x0328, 0x0043, 0x0301, 0x0063, 0x0301, - 0x0043, 0x0302, 0x0063, 0x0302, 0x0043, 0x0307, 0x0063, 0x0307, - 0x0043, 0x030c, 0x0063, 0x030c, 0x0044, 0x030c, 0x0064, 0x030c, + 0x00c6, 0x00c6, 0x00c9, 0x00c9, 0x00cc, 0x00cc, 0x00cf, 0x00cf, + 0x00d2, 0x00d2, 0x00d5, 0x00d5, 0x00d8, 0x00d8, 0x00db, 0x00db, + 0x00de, 0x00de, 0x00e1, 0x00e1, 0x00e4, 0x00e4, 0x00e7, 0x00e7, + 0x00ea, 0x00ea, 0x00ed, 0x00ed, 0x00f0, 0x00f0, 0x00f3, 0x00f3, /* 0x0110 .. 0x011f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0045, 0x0304, 0x0065, 0x0304, - 0x0045, 0x0306, 0x0065, 0x0306, 0x0045, 0x0307, 0x0065, 0x0307, - 0x0045, 0x0328, 0x0065, 0x0328, 0x0045, 0x030c, 0x0065, 0x030c, - 0x0047, 0x0302, 0x0067, 0x0302, 0x0047, 0x0306, 0x0067, 0x0306, + 0x0000, 0x0000, 0x0000, 0x0000, 0x00f6, 0x00f6, 0x00f9, 0x00f9, + 0x00fc, 0x00fc, 0x00ff, 0x00ff, 0x0102, 0x0102, 0x0105, 0x0105, + 0x0108, 0x0108, 0x010b, 0x010b, 0x010e, 0x010e, 0x0111, 0x0111, + 0x0114, 0x0114, 0x0117, 0x0117, 0x011a, 0x011a, 0x011d, 0x011d, /* 0x0120 .. 0x012f */ - 0x0047, 0x0307, 0x0067, 0x0307, 0x0047, 0x0327, 0x0067, 0x0327, - 0x0048, 0x0302, 0x0068, 0x0302, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0049, 0x0303, 0x0069, 0x0303, 0x0049, 0x0304, 0x0069, 0x0304, - 0x0049, 0x0306, 0x0069, 0x0306, 0x0049, 0x0328, 0x0069, 0x0328, + 0x0120, 0x0120, 0x0123, 0x0123, 0x0126, 0x0126, 0x0129, 0x0129, + 0x012c, 0x012c, 0x012f, 0x012f, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0132, 0x0132, 0x0135, 0x0135, 0x0138, 0x0138, 0x013b, 0x013b, + 0x013e, 0x013e, 0x0141, 0x0141, 0x0144, 0x0144, 0x0147, 0x0147, /* 0x0130 .. 0x013f */ - 0x0049, 0x0307, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x004a, 0x0302, 0x006a, 0x0302, 0x004b, 0x0327, 0x006b, 0x0327, - 0x0000, 0x0000, 0x004c, 0x0301, 0x006c, 0x0301, 0x004c, 0x0327, - 0x006c, 0x0327, 0x004c, 0x030c, 0x006c, 0x030c, 0x0000, 0x0000, + 0x014a, 0x014a, 0x0000, 0x0000, 0x0000, 0x014d, 0x0000, 0x0150, + 0x0153, 0x0153, 0x0156, 0x0156, 0x0159, 0x0159, 0x015c, 0x015c, + 0x0000, 0x0000, 0x015f, 0x015f, 0x0162, 0x0162, 0x0165, 0x0165, + 0x0168, 0x0168, 0x016b, 0x016b, 0x016e, 0x016e, 0x0000, 0x0171, /* 0x0140 .. 0x014f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x004e, 0x0301, - 0x006e, 0x0301, 0x004e, 0x0327, 0x006e, 0x0327, 0x004e, 0x030c, - 0x006e, 0x030c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x004f, 0x0304, 0x006f, 0x0304, 0x004f, 0x0306, 0x006f, 0x0306, + 0x0000, 0x0174, 0x0000, 0x0000, 0x0000, 0x0000, 0x0177, 0x0177, + 0x017a, 0x017a, 0x017d, 0x017d, 0x0180, 0x0180, 0x0183, 0x0183, + 0x0186, 0x0186, 0x0000, 0x0189, 0x0000, 0x0000, 0x0000, 0x0000, + 0x018c, 0x018c, 0x018f, 0x018f, 0x0192, 0x0192, 0x0195, 0x0195, /* 0x0150 .. 0x015f */ - 0x004f, 0x030b, 0x006f, 0x030b, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0052, 0x0301, 0x0072, 0x0301, 0x0052, 0x0327, 0x0072, 0x0327, - 0x0052, 0x030c, 0x0072, 0x030c, 0x0053, 0x0301, 0x0073, 0x0301, - 0x0053, 0x0302, 0x0073, 0x0302, 0x0053, 0x0327, 0x0073, 0x0327, + 0x0198, 0x0198, 0x019b, 0x019b, 0x0000, 0x0000, 0x0000, 0x0000, + 0x019e, 0x019e, 0x01a1, 0x01a1, 0x01a4, 0x01a4, 0x01a7, 0x01a7, + 0x01aa, 0x01aa, 0x01ad, 0x01ad, 0x01b0, 0x01b0, 0x01b3, 0x01b3, + 0x01b6, 0x01b6, 0x01b9, 0x01b9, 0x01bc, 0x01bc, 0x01bf, 0x01bf, /* 0x0160 .. 0x016f */ - 0x0053, 0x030c, 0x0073, 0x030c, 0x0054, 0x0327, 0x0074, 0x0327, - 0x0054, 0x030c, 0x0074, 0x030c, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0055, 0x0303, 0x0075, 0x0303, 0x0055, 0x0304, 0x0075, 0x0304, - 0x0055, 0x0306, 0x0075, 0x0306, 0x0055, 0x030a, 0x0075, 0x030a, + 0x01c2, 0x01c2, 0x01c5, 0x01c5, 0x01c8, 0x01c8, 0x01cb, 0x01cb, + 0x01ce, 0x01ce, 0x01d1, 0x01d1, 0x0000, 0x0000, 0x0000, 0x0000, + 0x01d4, 0x01d4, 0x01d7, 0x01d7, 0x01da, 0x01da, 0x01dd, 0x01dd, + 0x01e0, 0x01e0, 0x01e3, 0x01e3, 0x01e6, 0x01e6, 0x01e9, 0x01e9, /* 0x0170 .. 0x017f */ - 0x0055, 0x030b, 0x0075, 0x030b, 0x0055, 0x0328, 0x0075, 0x0328, - 0x0057, 0x0302, 0x0077, 0x0302, 0x0059, 0x0302, 0x0079, 0x0302, - 0x0059, 0x0308, 0x005a, 0x0301, 0x007a, 0x0301, 0x005a, 0x0307, - 0x007a, 0x0307, 0x005a, 0x030c, 0x007a, 0x030c, 0x0000, 0x0000, + 0x01ec, 0x01ec, 0x01ef, 0x01ef, 0x01f2, 0x01f2, 0x01f5, 0x01f5, + 0x01f8, 0x01f8, 0x01fb, 0x01fb, 0x01fe, 0x01fe, 0x0201, 0x0201, + 0x0204, 0x0204, 0x0207, 0x0207, 0x020a, 0x020a, 0x020d, 0x020d, + 0x0210, 0x0210, 0x0213, 0x0213, 0x0216, 0x0216, 0x0000, 0x0219, /* 0x01a0 .. 0x01af */ - 0x004f, 0x031b, 0x006f, 0x031b, 0x0000, 0x0000, 0x0000, 0x0000, + 0x021b, 0x021b, 0x021e, 0x021e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0055, 0x031b, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0221, 0x0221, /* 0x01b0 .. 0x01bf */ - 0x0075, 0x031b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0224, 0x0224, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x01c0 .. 0x01cf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0041, 0x030c, 0x0061, 0x030c, 0x0049, 0x030c, + 0x0000, 0x0227, 0x0000, 0x022b, 0x0000, 0x022f, 0x0000, 0x0233, + 0x0000, 0x0236, 0x0000, 0x0239, 0x0000, 0x023c, 0x0000, 0x023f, + 0x0000, 0x0242, 0x0245, 0x0245, 0x0248, 0x0248, 0x024b, 0x024b, /* 0x01d0 .. 0x01df */ - 0x0069, 0x030c, 0x004f, 0x030c, 0x006f, 0x030c, 0x0055, 0x030c, - 0x0075, 0x030c, 0x00dc, 0x0304, 0x00fc, 0x0304, 0x00dc, 0x0301, - 0x00fc, 0x0301, 0x00dc, 0x030c, 0x00fc, 0x030c, 0x00dc, 0x0300, - 0x00fc, 0x0300, 0x0000, 0x0000, 0x00c4, 0x0304, 0x00e4, 0x0304, + 0x024e, 0x024e, 0x0251, 0x0251, 0x0254, 0x0254, 0x0257, 0x0257, + 0x025a, 0x025a, 0x025d, 0x025d, 0x0261, 0x0261, 0x0265, 0x0265, + 0x0269, 0x0269, 0x026d, 0x026d, 0x0271, 0x0271, 0x0275, 0x0275, + 0x0279, 0x0279, 0x0000, 0x0000, 0x027d, 0x027d, 0x0281, 0x0281, /* 0x01e0 .. 0x01ef */ - 0x0226, 0x0304, 0x0227, 0x0304, 0x00c6, 0x0304, 0x00e6, 0x0304, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0047, 0x030c, 0x0067, 0x030c, - 0x004b, 0x030c, 0x006b, 0x030c, 0x004f, 0x0328, 0x006f, 0x0328, - 0x01ea, 0x0304, 0x01eb, 0x0304, 0x01b7, 0x030c, 0x0292, 0x030c, + 0x0285, 0x0285, 0x0289, 0x0289, 0x028d, 0x028d, 0x0290, 0x0290, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0293, 0x0293, 0x0296, 0x0296, + 0x0299, 0x0299, 0x029c, 0x029c, 0x029f, 0x029f, 0x02a2, 0x02a2, + 0x02a5, 0x02a5, 0x02a9, 0x02a9, 0x02ad, 0x02ad, 0x02b0, 0x02b0, /* 0x01f0 .. 0x01ff */ - 0x006a, 0x030c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0047, 0x0301, 0x0067, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, - 0x004e, 0x0300, 0x006e, 0x0300, 0x00c5, 0x0301, 0x00e5, 0x0301, - 0x00c6, 0x0301, 0x00e6, 0x0301, 0x00d8, 0x0301, 0x00f8, 0x0301, + 0x02b3, 0x02b3, 0x0000, 0x02b6, 0x0000, 0x02b9, 0x0000, 0x02bc, + 0x02bf, 0x02bf, 0x02c2, 0x02c2, 0x0000, 0x0000, 0x0000, 0x0000, + 0x02c5, 0x02c5, 0x02c8, 0x02c8, 0x02cb, 0x02cb, 0x02cf, 0x02cf, + 0x02d3, 0x02d3, 0x02d6, 0x02d6, 0x02d9, 0x02d9, 0x02dc, 0x02dc, /* 0x0200 .. 0x020f */ - 0x0041, 0x030f, 0x0061, 0x030f, 0x0041, 0x0311, 0x0061, 0x0311, - 0x0045, 0x030f, 0x0065, 0x030f, 0x0045, 0x0311, 0x0065, 0x0311, - 0x0049, 0x030f, 0x0069, 0x030f, 0x0049, 0x0311, 0x0069, 0x0311, - 0x004f, 0x030f, 0x006f, 0x030f, 0x004f, 0x0311, 0x006f, 0x0311, + 0x02df, 0x02df, 0x02e2, 0x02e2, 0x02e5, 0x02e5, 0x02e8, 0x02e8, + 0x02eb, 0x02eb, 0x02ee, 0x02ee, 0x02f1, 0x02f1, 0x02f4, 0x02f4, + 0x02f7, 0x02f7, 0x02fa, 0x02fa, 0x02fd, 0x02fd, 0x0300, 0x0300, + 0x0303, 0x0303, 0x0306, 0x0306, 0x0309, 0x0309, 0x030c, 0x030c, /* 0x0210 .. 0x021f */ - 0x0052, 0x030f, 0x0072, 0x030f, 0x0052, 0x0311, 0x0072, 0x0311, - 0x0055, 0x030f, 0x0075, 0x030f, 0x0055, 0x0311, 0x0075, 0x0311, - 0x0053, 0x0326, 0x0073, 0x0326, 0x0054, 0x0326, 0x0074, 0x0326, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0048, 0x030c, 0x0068, 0x030c, + 0x030f, 0x030f, 0x0312, 0x0312, 0x0315, 0x0315, 0x0318, 0x0318, + 0x031b, 0x031b, 0x031e, 0x031e, 0x0321, 0x0321, 0x0324, 0x0324, + 0x0327, 0x0327, 0x032a, 0x032a, 0x032d, 0x032d, 0x0330, 0x0330, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0333, 0x0333, 0x0336, 0x0336, /* 0x0220 .. 0x022f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0041, 0x0307, 0x0061, 0x0307, - 0x0045, 0x0327, 0x0065, 0x0327, 0x00d6, 0x0304, 0x00f6, 0x0304, - 0x00d5, 0x0304, 0x00f5, 0x0304, 0x004f, 0x0307, 0x006f, 0x0307, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0339, 0x0339, 0x033c, 0x033c, + 0x033f, 0x033f, 0x0342, 0x0342, 0x0345, 0x0345, 0x0349, 0x0349, + 0x034d, 0x034d, 0x0351, 0x0351, 0x0355, 0x0355, 0x0358, 0x0358, /* 0x0230 .. 0x023f */ - 0x022e, 0x0304, 0x022f, 0x0304, 0x0059, 0x0304, 0x0079, 0x0304, + 0x035b, 0x035b, 0x035f, 0x035f, 0x0363, 0x0363, 0x0366, 0x0366, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x02b0 .. 0x02bf */ + 0x0000, 0x0369, 0x0000, 0x036b, 0x0000, 0x036d, 0x0000, 0x036f, + 0x0000, 0x0371, 0x0000, 0x0373, 0x0000, 0x0375, 0x0000, 0x0377, + 0x0000, 0x0379, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x02d0 .. 0x02df */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x037b, 0x0000, 0x037e, 0x0000, 0x0381, 0x0000, 0x0384, + 0x0000, 0x0387, 0x0000, 0x038a, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x02e0 .. 0x02ef */ + 0x0000, 0x038d, 0x0000, 0x038f, 0x0000, 0x0219, 0x0000, 0x0391, + 0x0000, 0x0393, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0340 .. 0x034f */ + 0x0395, 0x0395, 0x0397, 0x0397, 0x0000, 0x0000, 0x0399, 0x0399, + 0x039b, 0x039b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0308, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0370 .. 0x037f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x039e, 0x039e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x03a0, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x03a3, 0x03a3, 0x0000, 0x0000, /* 0x0380 .. 0x038f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x00a8, 0x0301, 0x0391, 0x0301, 0x0000, 0x0000, - 0x0395, 0x0301, 0x0397, 0x0301, 0x0399, 0x0301, 0x0000, 0x0000, - 0x039f, 0x0301, 0x0000, 0x0000, 0x03a5, 0x0301, 0x03a9, 0x0301, + 0x0000, 0x000f, 0x03a5, 0x03a8, 0x03ac, 0x03ac, 0x03af, 0x03af, + 0x03b1, 0x03b1, 0x03b4, 0x03b4, 0x03b7, 0x03b7, 0x0000, 0x0000, + 0x03ba, 0x03ba, 0x0000, 0x0000, 0x03bd, 0x03bd, 0x03c0, 0x03c0, /* 0x0390 .. 0x039f */ - 0x03ca, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x03c3, 0x03c3, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03a0 .. 0x03af */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0399, 0x0308, 0x03a5, 0x0308, - 0x03b1, 0x0301, 0x03b5, 0x0301, 0x03b7, 0x0301, 0x03b9, 0x0301, + 0x0000, 0x0000, 0x0000, 0x0000, 0x03c7, 0x03c7, 0x03ca, 0x03ca, + 0x03cd, 0x03cd, 0x03d0, 0x03d0, 0x03d3, 0x03d3, 0x03d6, 0x03d6, /* 0x03b0 .. 0x03bf */ - 0x03cb, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x03d9, 0x03d9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03c0 .. 0x03cf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x03b9, 0x0308, 0x03c5, 0x0308, - 0x03bf, 0x0301, 0x03c5, 0x0301, 0x03c9, 0x0301, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x03dd, 0x03dd, 0x03e0, 0x03e0, + 0x03e3, 0x03e3, 0x03e6, 0x03e6, 0x03e9, 0x03e9, 0x0000, 0x0000, /* 0x03d0 .. 0x03df */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x03d2, 0x0301, - 0x03d2, 0x0308, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x03ec, 0x0000, 0x03ee, 0x0000, 0x03f0, 0x03f2, 0x03bd, + 0x03f5, 0x03ca, 0x0000, 0x03f8, 0x0000, 0x03fa, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x03f0 .. 0x03ff */ + 0x0000, 0x03fc, 0x0000, 0x03fe, 0x0000, 0x0400, 0x0000, 0x0000, + 0x0000, 0x0402, 0x0000, 0x0404, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0406, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0400 .. 0x040f */ - 0x0415, 0x0300, 0x0415, 0x0308, 0x0000, 0x0000, 0x0413, 0x0301, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0406, 0x0308, + 0x0408, 0x0408, 0x040b, 0x040b, 0x0000, 0x0000, 0x040e, 0x040e, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0411, 0x0411, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x041a, 0x0301, 0x0418, 0x0300, 0x0423, 0x0306, 0x0000, 0x0000, + 0x0414, 0x0414, 0x0417, 0x0417, 0x041a, 0x041a, 0x0000, 0x0000, /* 0x0410 .. 0x041f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0418, 0x0306, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x041d, 0x041d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0430 .. 0x043f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0438, 0x0306, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0420, 0x0420, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0450 .. 0x045f */ - 0x0435, 0x0300, 0x0435, 0x0308, 0x0000, 0x0000, 0x0433, 0x0301, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0456, 0x0308, + 0x0423, 0x0423, 0x0426, 0x0426, 0x0000, 0x0000, 0x0429, 0x0429, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x042c, 0x042c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x043a, 0x0301, 0x0438, 0x0300, 0x0443, 0x0306, 0x0000, 0x0000, + 0x042f, 0x042f, 0x0432, 0x0432, 0x0435, 0x0435, 0x0000, 0x0000, /* 0x0470 .. 0x047f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0474, 0x030f, 0x0475, 0x030f, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0438, 0x0438, 0x043b, 0x043b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x04c0 .. 0x04cf */ - 0x0000, 0x0000, 0x0416, 0x0306, 0x0436, 0x0306, 0x0000, 0x0000, + 0x0000, 0x0000, 0x043e, 0x043e, 0x0441, 0x0441, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x04d0 .. 0x04df */ - 0x0410, 0x0306, 0x0430, 0x0306, 0x0410, 0x0308, 0x0430, 0x0308, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0415, 0x0306, 0x0435, 0x0306, - 0x0000, 0x0000, 0x0000, 0x0000, 0x04d8, 0x0308, 0x04d9, 0x0308, - 0x0416, 0x0308, 0x0436, 0x0308, 0x0417, 0x0308, 0x0437, 0x0308, + 0x0444, 0x0444, 0x0447, 0x0447, 0x044a, 0x044a, 0x044d, 0x044d, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0450, 0x0450, 0x0453, 0x0453, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0456, 0x0456, 0x0459, 0x0459, + 0x045c, 0x045c, 0x045f, 0x045f, 0x0462, 0x0462, 0x0465, 0x0465, /* 0x04e0 .. 0x04ef */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0418, 0x0304, 0x0438, 0x0304, - 0x0418, 0x0308, 0x0438, 0x0308, 0x041e, 0x0308, 0x043e, 0x0308, - 0x0000, 0x0000, 0x0000, 0x0000, 0x04e8, 0x0308, 0x04e9, 0x0308, - 0x042d, 0x0308, 0x044d, 0x0308, 0x0423, 0x0304, 0x0443, 0x0304, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0468, 0x0468, 0x046b, 0x046b, + 0x046e, 0x046e, 0x0471, 0x0471, 0x0474, 0x0474, 0x0477, 0x0477, + 0x0000, 0x0000, 0x0000, 0x0000, 0x047a, 0x047a, 0x047d, 0x047d, + 0x0480, 0x0480, 0x0483, 0x0483, 0x0486, 0x0486, 0x0489, 0x0489, /* 0x04f0 .. 0x04ff */ - 0x0423, 0x0308, 0x0443, 0x0308, 0x0423, 0x030b, 0x0443, 0x030b, - 0x0427, 0x0308, 0x0447, 0x0308, 0x0000, 0x0000, 0x0000, 0x0000, - 0x042b, 0x0308, 0x044b, 0x0308, 0x0000, 0x0000, 0x0000, 0x0000, + 0x048c, 0x048c, 0x048f, 0x048f, 0x0492, 0x0492, 0x0495, 0x0495, + 0x0498, 0x0498, 0x049b, 0x049b, 0x0000, 0x0000, 0x0000, 0x0000, + 0x049e, 0x049e, 0x04a1, 0x04a1, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0580 .. 0x058f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x04a4, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0620 .. 0x062f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0627, 0x0653, 0x0627, 0x0654, - 0x0648, 0x0654, 0x0627, 0x0655, 0x064a, 0x0654, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x04a7, 0x04a7, 0x04aa, 0x04aa, + 0x04ad, 0x04ad, 0x04b0, 0x04b0, 0x04b3, 0x04b3, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0670 .. 0x067f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x04b6, 0x0000, 0x04b9, 0x0000, 0x04bc, + 0x0000, 0x04bf, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x06c0 .. 0x06cf */ - 0x06d5, 0x0654, 0x0000, 0x0000, 0x06c1, 0x0654, 0x0000, 0x0000, + 0x04c2, 0x04c2, 0x0000, 0x0000, 0x04c5, 0x04c5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x06d0 .. 0x06df */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x06d2, 0x0654, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x04c8, 0x04c8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0920 .. 0x092f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0928, 0x093c, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x04cb, 0x04cb, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0930 .. 0x093f */ - 0x0000, 0x0000, 0x0930, 0x093c, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0933, 0x093c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x04ce, 0x04ce, 0x0000, 0x0000, 0x0000, 0x0000, + 0x04d1, 0x04d1, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0950 .. 0x095f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0915, 0x093c, 0x0916, 0x093c, 0x0917, 0x093c, 0x091c, 0x093c, - 0x0921, 0x093c, 0x0922, 0x093c, 0x092b, 0x093c, 0x092f, 0x093c, + 0x04d4, 0x04d4, 0x04d7, 0x04d7, 0x04da, 0x04da, 0x04dd, 0x04dd, + 0x04e0, 0x04e0, 0x04e3, 0x04e3, 0x04e6, 0x04e6, 0x04e9, 0x04e9, /* 0x09c0 .. 0x09cf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x09c7, 0x09be, - 0x09c7, 0x09d7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x04ec, 0x04ec, + 0x04ef, 0x04ef, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x09d0 .. 0x09df */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x09a1, 0x09bc, 0x09a2, 0x09bc, 0x0000, 0x0000, 0x09af, 0x09bc, + 0x04f2, 0x04f2, 0x04f5, 0x04f5, 0x0000, 0x0000, 0x04f8, 0x04f8, /* 0x0a30 .. 0x0a3f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0a32, 0x0a3c, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0a38, 0x0a3c, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x04fb, 0x04fb, + 0x0000, 0x0000, 0x0000, 0x0000, 0x04fe, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0a50 .. 0x0a5f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0a16, 0x0a3c, 0x0a17, 0x0a3c, 0x0a1c, 0x0a3c, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0a2b, 0x0a3c, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0501, 0x0501, 0x0504, 0x0504, 0x0507, 0x0507, + 0x0000, 0x0000, 0x0000, 0x0000, 0x050a, 0x050a, 0x0000, 0x0000, /* 0x0b40 .. 0x0b4f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0b47, 0x0b56, 0x0000, 0x0000, 0x0000, 0x0000, 0x0b47, 0x0b3e, - 0x0b47, 0x0b57, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x050d, 0x050d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0510, 0x0510, + 0x0513, 0x0513, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0b50 .. 0x0b5f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0b21, 0x0b3c, 0x0b22, 0x0b3c, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0516, 0x0516, 0x0519, 0x0519, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0b90 .. 0x0b9f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0b92, 0x0bd7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x051c, 0x051c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0bc0 .. 0x0bcf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0bc6, 0x0bbe, 0x0bc7, 0x0bbe, - 0x0bc6, 0x0bd7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x051f, 0x051f, 0x0522, 0x0522, + 0x0525, 0x0525, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0c40 .. 0x0c4f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0c46, 0x0c56, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0528, 0x0528, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0cc0 .. 0x0ccf */ - 0x0cbf, 0x0cd5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0cc6, 0x0cd5, - 0x0cc6, 0x0cd6, 0x0000, 0x0000, 0x0cc6, 0x0cc2, 0x0cca, 0x0cd5, + 0x052b, 0x052b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x052e, 0x052e, + 0x0531, 0x0531, 0x0000, 0x0000, 0x0534, 0x0534, 0x0537, 0x0537, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0d40 .. 0x0d4f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0d46, 0x0d3e, 0x0d47, 0x0d3e, - 0x0d46, 0x0d57, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x053b, 0x053b, 0x053e, 0x053e, + 0x0541, 0x0541, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0dd0 .. 0x0ddf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0dd9, 0x0dca, 0x0000, 0x0000, - 0x0dd9, 0x0dcf, 0x0ddc, 0x0dca, 0x0dd9, 0x0ddf, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0544, 0x0544, 0x0000, 0x0000, + 0x0547, 0x0547, 0x054a, 0x054a, 0x054e, 0x054e, 0x0000, 0x0000, + /* 0x0e30 .. 0x0e3f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0551, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0eb0 .. 0x0ebf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0554, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0ed0 .. 0x0edf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0557, 0x0000, 0x055a, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0f00 .. 0x0f0f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x055d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f40 .. 0x0f4f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0f42, 0x0fb7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x055f, 0x055f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0f4c, 0x0fb7, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0562, 0x0562, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f50 .. 0x0f5f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0f51, 0x0fb7, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0f56, 0x0fb7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0565, 0x0565, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0568, 0x0568, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0f5b, 0x0fb7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x056b, 0x056b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f60 .. 0x0f6f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0f40, 0x0fb5, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x056e, 0x056e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f70 .. 0x0f7f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0f71, 0x0f72, - 0x0000, 0x0000, 0x0f71, 0x0f74, 0x0fb2, 0x0f80, 0x0000, 0x0000, - 0x0fb3, 0x0f80, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0571, 0x0571, + 0x0000, 0x0000, 0x0574, 0x0574, 0x0577, 0x0577, 0x0000, 0x057a, + 0x057e, 0x057e, 0x0000, 0x0581, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f80 .. 0x0f8f */ - 0x0000, 0x0000, 0x0f71, 0x0f80, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0585, 0x0585, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0f90 .. 0x0f9f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0f92, 0x0fb7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0588, 0x0588, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0f9c, 0x0fb7, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x058b, 0x058b, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0fa0 .. 0x0faf */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0fa1, 0x0fb7, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0fa6, 0x0fb7, + 0x0000, 0x0000, 0x0000, 0x0000, 0x058e, 0x058e, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0591, 0x0591, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0fab, 0x0fb7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0594, 0x0594, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0fb0 .. 0x0fbf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0f90, 0x0fb5, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0597, 0x0597, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1020 .. 0x102f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x1025, 0x102e, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x059a, 0x059a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x10f0 .. 0x10ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x059d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1b00 .. 0x1b0f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x1b05, 0x1b35, 0x0000, 0x0000, - 0x1b07, 0x1b35, 0x0000, 0x0000, 0x1b09, 0x1b35, 0x0000, 0x0000, - 0x1b0b, 0x1b35, 0x0000, 0x0000, 0x1b0d, 0x1b35, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x059f, 0x059f, 0x0000, 0x0000, + 0x05a2, 0x05a2, 0x0000, 0x0000, 0x05a5, 0x05a5, 0x0000, 0x0000, + 0x05a8, 0x05a8, 0x0000, 0x0000, 0x05ab, 0x05ab, 0x0000, 0x0000, /* 0x1b10 .. 0x1b1f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x1b11, 0x1b35, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x05ae, 0x05ae, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1b30 .. 0x1b3f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1b3a, 0x1b35, - 0x0000, 0x0000, 0x1b3c, 0x1b35, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x05b1, 0x05b1, + 0x0000, 0x0000, 0x05b4, 0x05b4, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1b40 .. 0x1b4f */ - 0x1b3e, 0x1b35, 0x1b3f, 0x1b35, 0x0000, 0x0000, 0x1b42, 0x1b35, + 0x05b7, 0x05b7, 0x05ba, 0x05ba, 0x0000, 0x0000, 0x05bd, 0x05bd, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1d20 .. 0x1d2f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x05c0, 0x0000, 0x05c2, 0x0000, 0x05c4, 0x0000, 0x0000, + /* 0x1d30 .. 0x1d3f */ + 0x0000, 0x05c6, 0x0000, 0x05c8, 0x0000, 0x05ca, 0x0000, 0x05cc, + 0x0000, 0x05ce, 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, + 0x0000, 0x05d6, 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x0000, + 0x0000, 0x05dc, 0x0000, 0x05de, 0x0000, 0x05e0, 0x0000, 0x05e2, + /* 0x1d40 .. 0x1d4f */ + 0x0000, 0x05e4, 0x0000, 0x05e6, 0x0000, 0x05e8, 0x0000, 0x0006, + 0x0000, 0x05ea, 0x0000, 0x05ec, 0x0000, 0x05ee, 0x0000, 0x05f0, + 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x05f6, 0x0000, 0x05f8, + 0x0000, 0x05fa, 0x0000, 0x05fc, 0x0000, 0x0000, 0x0000, 0x05fe, + /* 0x1d50 .. 0x1d5f */ + 0x0000, 0x0600, 0x0000, 0x0602, 0x0000, 0x0019, 0x0000, 0x0604, + 0x0000, 0x0606, 0x0000, 0x0608, 0x0000, 0x060a, 0x0000, 0x060c, + 0x0000, 0x060e, 0x0000, 0x0610, 0x0000, 0x0612, 0x0000, 0x0614, + 0x0000, 0x0616, 0x0000, 0x03ec, 0x0000, 0x0618, 0x0000, 0x061a, + /* 0x1d60 .. 0x1d6f */ + 0x0000, 0x03f8, 0x0000, 0x061c, 0x0000, 0x061e, 0x0000, 0x036f, + 0x0000, 0x060e, 0x0000, 0x0614, 0x0000, 0x03ec, 0x0000, 0x0618, + 0x0000, 0x03fe, 0x0000, 0x03f8, 0x0000, 0x061c, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1d70 .. 0x1d7f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0620, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1d90 .. 0x1d9f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0622, + 0x0000, 0x0624, 0x0000, 0x0626, 0x0000, 0x0628, 0x0000, 0x05fa, + /* 0x1da0 .. 0x1daf */ + 0x0000, 0x062a, 0x0000, 0x062c, 0x0000, 0x062e, 0x0000, 0x0630, + 0x0000, 0x0632, 0x0000, 0x0634, 0x0000, 0x0636, 0x0000, 0x0638, + 0x0000, 0x063a, 0x0000, 0x063c, 0x0000, 0x063e, 0x0000, 0x0640, + 0x0000, 0x0642, 0x0000, 0x0644, 0x0000, 0x0646, 0x0000, 0x0648, + /* 0x1db0 .. 0x1dbf */ + 0x0000, 0x064a, 0x0000, 0x064c, 0x0000, 0x064e, 0x0000, 0x0650, + 0x0000, 0x0652, 0x0000, 0x0654, 0x0000, 0x0656, 0x0000, 0x0658, + 0x0000, 0x065a, 0x0000, 0x065c, 0x0000, 0x065e, 0x0000, 0x0660, + 0x0000, 0x0662, 0x0000, 0x0664, 0x0000, 0x0666, 0x0000, 0x03ee, /* 0x1e00 .. 0x1e0f */ - 0x0041, 0x0325, 0x0061, 0x0325, 0x0042, 0x0307, 0x0062, 0x0307, - 0x0042, 0x0323, 0x0062, 0x0323, 0x0042, 0x0331, 0x0062, 0x0331, - 0x00c7, 0x0301, 0x00e7, 0x0301, 0x0044, 0x0307, 0x0064, 0x0307, - 0x0044, 0x0323, 0x0064, 0x0323, 0x0044, 0x0331, 0x0064, 0x0331, + 0x0668, 0x0668, 0x066b, 0x066b, 0x066e, 0x066e, 0x0671, 0x0671, + 0x0674, 0x0674, 0x0677, 0x0677, 0x067a, 0x067a, 0x067d, 0x067d, + 0x0680, 0x0680, 0x0684, 0x0684, 0x0688, 0x0688, 0x068b, 0x068b, + 0x068e, 0x068e, 0x0691, 0x0691, 0x0694, 0x0694, 0x0697, 0x0697, /* 0x1e10 .. 0x1e1f */ - 0x0044, 0x0327, 0x0064, 0x0327, 0x0044, 0x032d, 0x0064, 0x032d, - 0x0112, 0x0300, 0x0113, 0x0300, 0x0112, 0x0301, 0x0113, 0x0301, - 0x0045, 0x032d, 0x0065, 0x032d, 0x0045, 0x0330, 0x0065, 0x0330, - 0x0228, 0x0306, 0x0229, 0x0306, 0x0046, 0x0307, 0x0066, 0x0307, + 0x069a, 0x069a, 0x069d, 0x069d, 0x06a0, 0x06a0, 0x06a3, 0x06a3, + 0x06a6, 0x06a6, 0x06aa, 0x06aa, 0x06ae, 0x06ae, 0x06b2, 0x06b2, + 0x06b6, 0x06b6, 0x06b9, 0x06b9, 0x06bc, 0x06bc, 0x06bf, 0x06bf, + 0x06c2, 0x06c2, 0x06c6, 0x06c6, 0x06ca, 0x06ca, 0x06cd, 0x06cd, /* 0x1e20 .. 0x1e2f */ - 0x0047, 0x0304, 0x0067, 0x0304, 0x0048, 0x0307, 0x0068, 0x0307, - 0x0048, 0x0323, 0x0068, 0x0323, 0x0048, 0x0308, 0x0068, 0x0308, - 0x0048, 0x0327, 0x0068, 0x0327, 0x0048, 0x032e, 0x0068, 0x032e, - 0x0049, 0x0330, 0x0069, 0x0330, 0x00cf, 0x0301, 0x00ef, 0x0301, + 0x06d0, 0x06d0, 0x06d3, 0x06d3, 0x06d6, 0x06d6, 0x06d9, 0x06d9, + 0x06dc, 0x06dc, 0x06df, 0x06df, 0x06e2, 0x06e2, 0x06e5, 0x06e5, + 0x06e8, 0x06e8, 0x06eb, 0x06eb, 0x06ee, 0x06ee, 0x06f1, 0x06f1, + 0x06f4, 0x06f4, 0x06f7, 0x06f7, 0x06fa, 0x06fa, 0x06fe, 0x06fe, /* 0x1e30 .. 0x1e3f */ - 0x004b, 0x0301, 0x006b, 0x0301, 0x004b, 0x0323, 0x006b, 0x0323, - 0x004b, 0x0331, 0x006b, 0x0331, 0x004c, 0x0323, 0x006c, 0x0323, - 0x1e36, 0x0304, 0x1e37, 0x0304, 0x004c, 0x0331, 0x006c, 0x0331, - 0x004c, 0x032d, 0x006c, 0x032d, 0x004d, 0x0301, 0x006d, 0x0301, + 0x0702, 0x0702, 0x0705, 0x0705, 0x0708, 0x0708, 0x070b, 0x070b, + 0x070e, 0x070e, 0x0711, 0x0711, 0x0714, 0x0714, 0x0717, 0x0717, + 0x071a, 0x071a, 0x071e, 0x071e, 0x0722, 0x0722, 0x0725, 0x0725, + 0x0728, 0x0728, 0x072b, 0x072b, 0x072e, 0x072e, 0x0731, 0x0731, /* 0x1e40 .. 0x1e4f */ - 0x004d, 0x0307, 0x006d, 0x0307, 0x004d, 0x0323, 0x006d, 0x0323, - 0x004e, 0x0307, 0x006e, 0x0307, 0x004e, 0x0323, 0x006e, 0x0323, - 0x004e, 0x0331, 0x006e, 0x0331, 0x004e, 0x032d, 0x006e, 0x032d, - 0x00d5, 0x0301, 0x00f5, 0x0301, 0x00d5, 0x0308, 0x00f5, 0x0308, + 0x0734, 0x0734, 0x0737, 0x0737, 0x073a, 0x073a, 0x073d, 0x073d, + 0x0740, 0x0740, 0x0743, 0x0743, 0x0746, 0x0746, 0x0749, 0x0749, + 0x074c, 0x074c, 0x074f, 0x074f, 0x0752, 0x0752, 0x0755, 0x0755, + 0x0758, 0x0758, 0x075c, 0x075c, 0x0760, 0x0760, 0x0764, 0x0764, /* 0x1e50 .. 0x1e5f */ - 0x014c, 0x0300, 0x014d, 0x0300, 0x014c, 0x0301, 0x014d, 0x0301, - 0x0050, 0x0301, 0x0070, 0x0301, 0x0050, 0x0307, 0x0070, 0x0307, - 0x0052, 0x0307, 0x0072, 0x0307, 0x0052, 0x0323, 0x0072, 0x0323, - 0x1e5a, 0x0304, 0x1e5b, 0x0304, 0x0052, 0x0331, 0x0072, 0x0331, + 0x0768, 0x0768, 0x076c, 0x076c, 0x0770, 0x0770, 0x0774, 0x0774, + 0x0778, 0x0778, 0x077b, 0x077b, 0x077e, 0x077e, 0x0781, 0x0781, + 0x0784, 0x0784, 0x0787, 0x0787, 0x078a, 0x078a, 0x078d, 0x078d, + 0x0790, 0x0790, 0x0794, 0x0794, 0x0798, 0x0798, 0x079b, 0x079b, /* 0x1e60 .. 0x1e6f */ - 0x0053, 0x0307, 0x0073, 0x0307, 0x0053, 0x0323, 0x0073, 0x0323, - 0x015a, 0x0307, 0x015b, 0x0307, 0x0160, 0x0307, 0x0161, 0x0307, - 0x1e62, 0x0307, 0x1e63, 0x0307, 0x0054, 0x0307, 0x0074, 0x0307, - 0x0054, 0x0323, 0x0074, 0x0323, 0x0054, 0x0331, 0x0074, 0x0331, + 0x079e, 0x079e, 0x07a1, 0x07a1, 0x07a4, 0x07a4, 0x07a7, 0x07a7, + 0x07aa, 0x07aa, 0x07ae, 0x07ae, 0x07b2, 0x07b2, 0x07b6, 0x07b6, + 0x07ba, 0x07ba, 0x07be, 0x07be, 0x07c2, 0x07c2, 0x07c5, 0x07c5, + 0x07c8, 0x07c8, 0x07cb, 0x07cb, 0x07ce, 0x07ce, 0x07d1, 0x07d1, /* 0x1e70 .. 0x1e7f */ - 0x0054, 0x032d, 0x0074, 0x032d, 0x0055, 0x0324, 0x0075, 0x0324, - 0x0055, 0x0330, 0x0075, 0x0330, 0x0055, 0x032d, 0x0075, 0x032d, - 0x0168, 0x0301, 0x0169, 0x0301, 0x016a, 0x0308, 0x016b, 0x0308, - 0x0056, 0x0303, 0x0076, 0x0303, 0x0056, 0x0323, 0x0076, 0x0323, + 0x07d4, 0x07d4, 0x07d7, 0x07d7, 0x07da, 0x07da, 0x07dd, 0x07dd, + 0x07e0, 0x07e0, 0x07e3, 0x07e3, 0x07e6, 0x07e6, 0x07e9, 0x07e9, + 0x07ec, 0x07ec, 0x07f0, 0x07f0, 0x07f4, 0x07f4, 0x07f8, 0x07f8, + 0x07fc, 0x07fc, 0x07ff, 0x07ff, 0x0802, 0x0802, 0x0805, 0x0805, /* 0x1e80 .. 0x1e8f */ - 0x0057, 0x0300, 0x0077, 0x0300, 0x0057, 0x0301, 0x0077, 0x0301, - 0x0057, 0x0308, 0x0077, 0x0308, 0x0057, 0x0307, 0x0077, 0x0307, - 0x0057, 0x0323, 0x0077, 0x0323, 0x0058, 0x0307, 0x0078, 0x0307, - 0x0058, 0x0308, 0x0078, 0x0308, 0x0059, 0x0307, 0x0079, 0x0307, + 0x0808, 0x0808, 0x080b, 0x080b, 0x080e, 0x080e, 0x0811, 0x0811, + 0x0814, 0x0814, 0x0817, 0x0817, 0x081a, 0x081a, 0x081d, 0x081d, + 0x0820, 0x0820, 0x0823, 0x0823, 0x0826, 0x0826, 0x0829, 0x0829, + 0x082c, 0x082c, 0x082f, 0x082f, 0x0832, 0x0832, 0x0835, 0x0835, /* 0x1e90 .. 0x1e9f */ - 0x005a, 0x0302, 0x007a, 0x0302, 0x005a, 0x0323, 0x007a, 0x0323, - 0x005a, 0x0331, 0x007a, 0x0331, 0x0068, 0x0331, 0x0074, 0x0308, - 0x0077, 0x030a, 0x0079, 0x030a, 0x0000, 0x0000, 0x017f, 0x0307, + 0x0838, 0x0838, 0x083b, 0x083b, 0x083e, 0x083e, 0x0841, 0x0841, + 0x0844, 0x0844, 0x0847, 0x0847, 0x084a, 0x084a, 0x084d, 0x084d, + 0x0850, 0x0850, 0x0853, 0x0853, 0x0000, 0x0856, 0x0859, 0x07a1, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1ea0 .. 0x1eaf */ - 0x0041, 0x0323, 0x0061, 0x0323, 0x0041, 0x0309, 0x0061, 0x0309, - 0x00c2, 0x0301, 0x00e2, 0x0301, 0x00c2, 0x0300, 0x00e2, 0x0300, - 0x00c2, 0x0309, 0x00e2, 0x0309, 0x00c2, 0x0303, 0x00e2, 0x0303, - 0x1ea0, 0x0302, 0x1ea1, 0x0302, 0x0102, 0x0301, 0x0103, 0x0301, + 0x085c, 0x085c, 0x085f, 0x085f, 0x0862, 0x0862, 0x0865, 0x0865, + 0x0868, 0x0868, 0x086c, 0x086c, 0x0870, 0x0870, 0x0874, 0x0874, + 0x0878, 0x0878, 0x087c, 0x087c, 0x0880, 0x0880, 0x0884, 0x0884, + 0x0888, 0x0888, 0x088c, 0x088c, 0x0890, 0x0890, 0x0894, 0x0894, /* 0x1eb0 .. 0x1ebf */ - 0x0102, 0x0300, 0x0103, 0x0300, 0x0102, 0x0309, 0x0103, 0x0309, - 0x0102, 0x0303, 0x0103, 0x0303, 0x1ea0, 0x0306, 0x1ea1, 0x0306, - 0x0045, 0x0323, 0x0065, 0x0323, 0x0045, 0x0309, 0x0065, 0x0309, - 0x0045, 0x0303, 0x0065, 0x0303, 0x00ca, 0x0301, 0x00ea, 0x0301, + 0x0898, 0x0898, 0x089c, 0x089c, 0x08a0, 0x08a0, 0x08a4, 0x08a4, + 0x08a8, 0x08a8, 0x08ac, 0x08ac, 0x08b0, 0x08b0, 0x08b4, 0x08b4, + 0x08b8, 0x08b8, 0x08bb, 0x08bb, 0x08be, 0x08be, 0x08c1, 0x08c1, + 0x08c4, 0x08c4, 0x08c7, 0x08c7, 0x08ca, 0x08ca, 0x08ce, 0x08ce, /* 0x1ec0 .. 0x1ecf */ - 0x00ca, 0x0300, 0x00ea, 0x0300, 0x00ca, 0x0309, 0x00ea, 0x0309, - 0x00ca, 0x0303, 0x00ea, 0x0303, 0x1eb8, 0x0302, 0x1eb9, 0x0302, - 0x0049, 0x0309, 0x0069, 0x0309, 0x0049, 0x0323, 0x0069, 0x0323, - 0x004f, 0x0323, 0x006f, 0x0323, 0x004f, 0x0309, 0x006f, 0x0309, + 0x08d2, 0x08d2, 0x08d6, 0x08d6, 0x08da, 0x08da, 0x08de, 0x08de, + 0x08e2, 0x08e2, 0x08e6, 0x08e6, 0x08ea, 0x08ea, 0x08ee, 0x08ee, + 0x08f2, 0x08f2, 0x08f5, 0x08f5, 0x08f8, 0x08f8, 0x08fb, 0x08fb, + 0x08fe, 0x08fe, 0x0901, 0x0901, 0x0904, 0x0904, 0x0907, 0x0907, /* 0x1ed0 .. 0x1edf */ - 0x00d4, 0x0301, 0x00f4, 0x0301, 0x00d4, 0x0300, 0x00f4, 0x0300, - 0x00d4, 0x0309, 0x00f4, 0x0309, 0x00d4, 0x0303, 0x00f4, 0x0303, - 0x1ecc, 0x0302, 0x1ecd, 0x0302, 0x01a0, 0x0301, 0x01a1, 0x0301, - 0x01a0, 0x0300, 0x01a1, 0x0300, 0x01a0, 0x0309, 0x01a1, 0x0309, + 0x090a, 0x090a, 0x090e, 0x090e, 0x0912, 0x0912, 0x0916, 0x0916, + 0x091a, 0x091a, 0x091e, 0x091e, 0x0922, 0x0922, 0x0926, 0x0926, + 0x092a, 0x092a, 0x092e, 0x092e, 0x0932, 0x0932, 0x0936, 0x0936, + 0x093a, 0x093a, 0x093e, 0x093e, 0x0942, 0x0942, 0x0946, 0x0946, /* 0x1ee0 .. 0x1eef */ - 0x01a0, 0x0303, 0x01a1, 0x0303, 0x01a0, 0x0323, 0x01a1, 0x0323, - 0x0055, 0x0323, 0x0075, 0x0323, 0x0055, 0x0309, 0x0075, 0x0309, - 0x01af, 0x0301, 0x01b0, 0x0301, 0x01af, 0x0300, 0x01b0, 0x0300, - 0x01af, 0x0309, 0x01b0, 0x0309, 0x01af, 0x0303, 0x01b0, 0x0303, + 0x094a, 0x094a, 0x094e, 0x094e, 0x0952, 0x0952, 0x0956, 0x0956, + 0x095a, 0x095a, 0x095d, 0x095d, 0x0960, 0x0960, 0x0963, 0x0963, + 0x0966, 0x0966, 0x096a, 0x096a, 0x096e, 0x096e, 0x0972, 0x0972, + 0x0976, 0x0976, 0x097a, 0x097a, 0x097e, 0x097e, 0x0982, 0x0982, /* 0x1ef0 .. 0x1eff */ - 0x01af, 0x0323, 0x01b0, 0x0323, 0x0059, 0x0300, 0x0079, 0x0300, - 0x0059, 0x0323, 0x0079, 0x0323, 0x0059, 0x0309, 0x0079, 0x0309, - 0x0059, 0x0303, 0x0079, 0x0303, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0986, 0x0986, 0x098a, 0x098a, 0x098e, 0x098e, 0x0991, 0x0991, + 0x0994, 0x0994, 0x0997, 0x0997, 0x099a, 0x099a, 0x099d, 0x099d, + 0x09a0, 0x09a0, 0x09a3, 0x09a3, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1f00 .. 0x1f0f */ - 0x03b1, 0x0313, 0x03b1, 0x0314, 0x1f00, 0x0300, 0x1f01, 0x0300, - 0x1f00, 0x0301, 0x1f01, 0x0301, 0x1f00, 0x0342, 0x1f01, 0x0342, - 0x0391, 0x0313, 0x0391, 0x0314, 0x1f08, 0x0300, 0x1f09, 0x0300, - 0x1f08, 0x0301, 0x1f09, 0x0301, 0x1f08, 0x0342, 0x1f09, 0x0342, + 0x09a6, 0x09a6, 0x09a9, 0x09a9, 0x09ac, 0x09ac, 0x09b0, 0x09b0, + 0x09b4, 0x09b4, 0x09b8, 0x09b8, 0x09bc, 0x09bc, 0x09c0, 0x09c0, + 0x09c4, 0x09c4, 0x09c7, 0x09c7, 0x09ca, 0x09ca, 0x09ce, 0x09ce, + 0x09d2, 0x09d2, 0x09d6, 0x09d6, 0x09da, 0x09da, 0x09de, 0x09de, /* 0x1f10 .. 0x1f1f */ - 0x03b5, 0x0313, 0x03b5, 0x0314, 0x1f10, 0x0300, 0x1f11, 0x0300, - 0x1f10, 0x0301, 0x1f11, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0395, 0x0313, 0x0395, 0x0314, 0x1f18, 0x0300, 0x1f19, 0x0300, - 0x1f18, 0x0301, 0x1f19, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, + 0x09e2, 0x09e2, 0x09e5, 0x09e5, 0x09e8, 0x09e8, 0x09ec, 0x09ec, + 0x09f0, 0x09f0, 0x09f4, 0x09f4, 0x0000, 0x0000, 0x0000, 0x0000, + 0x09f8, 0x09f8, 0x09fb, 0x09fb, 0x09fe, 0x09fe, 0x0a02, 0x0a02, + 0x0a06, 0x0a06, 0x0a0a, 0x0a0a, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1f20 .. 0x1f2f */ - 0x03b7, 0x0313, 0x03b7, 0x0314, 0x1f20, 0x0300, 0x1f21, 0x0300, - 0x1f20, 0x0301, 0x1f21, 0x0301, 0x1f20, 0x0342, 0x1f21, 0x0342, - 0x0397, 0x0313, 0x0397, 0x0314, 0x1f28, 0x0300, 0x1f29, 0x0300, - 0x1f28, 0x0301, 0x1f29, 0x0301, 0x1f28, 0x0342, 0x1f29, 0x0342, + 0x0a0e, 0x0a0e, 0x0a11, 0x0a11, 0x0a14, 0x0a14, 0x0a18, 0x0a18, + 0x0a1c, 0x0a1c, 0x0a20, 0x0a20, 0x0a24, 0x0a24, 0x0a28, 0x0a28, + 0x0a2c, 0x0a2c, 0x0a2f, 0x0a2f, 0x0a32, 0x0a32, 0x0a36, 0x0a36, + 0x0a3a, 0x0a3a, 0x0a3e, 0x0a3e, 0x0a42, 0x0a42, 0x0a46, 0x0a46, /* 0x1f30 .. 0x1f3f */ - 0x03b9, 0x0313, 0x03b9, 0x0314, 0x1f30, 0x0300, 0x1f31, 0x0300, - 0x1f30, 0x0301, 0x1f31, 0x0301, 0x1f30, 0x0342, 0x1f31, 0x0342, - 0x0399, 0x0313, 0x0399, 0x0314, 0x1f38, 0x0300, 0x1f39, 0x0300, - 0x1f38, 0x0301, 0x1f39, 0x0301, 0x1f38, 0x0342, 0x1f39, 0x0342, + 0x0a4a, 0x0a4a, 0x0a4d, 0x0a4d, 0x0a50, 0x0a50, 0x0a54, 0x0a54, + 0x0a58, 0x0a58, 0x0a5c, 0x0a5c, 0x0a60, 0x0a60, 0x0a64, 0x0a64, + 0x0a68, 0x0a68, 0x0a6b, 0x0a6b, 0x0a6e, 0x0a6e, 0x0a72, 0x0a72, + 0x0a76, 0x0a76, 0x0a7a, 0x0a7a, 0x0a7e, 0x0a7e, 0x0a82, 0x0a82, /* 0x1f40 .. 0x1f4f */ - 0x03bf, 0x0313, 0x03bf, 0x0314, 0x1f40, 0x0300, 0x1f41, 0x0300, - 0x1f40, 0x0301, 0x1f41, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, - 0x039f, 0x0313, 0x039f, 0x0314, 0x1f48, 0x0300, 0x1f49, 0x0300, - 0x1f48, 0x0301, 0x1f49, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0a86, 0x0a86, 0x0a89, 0x0a89, 0x0a8c, 0x0a8c, 0x0a90, 0x0a90, + 0x0a94, 0x0a94, 0x0a98, 0x0a98, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0a9c, 0x0a9c, 0x0a9f, 0x0a9f, 0x0aa2, 0x0aa2, 0x0aa6, 0x0aa6, + 0x0aaa, 0x0aaa, 0x0aae, 0x0aae, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1f50 .. 0x1f5f */ - 0x03c5, 0x0313, 0x03c5, 0x0314, 0x1f50, 0x0300, 0x1f51, 0x0300, - 0x1f50, 0x0301, 0x1f51, 0x0301, 0x1f50, 0x0342, 0x1f51, 0x0342, - 0x0000, 0x0000, 0x03a5, 0x0314, 0x0000, 0x0000, 0x1f59, 0x0300, - 0x0000, 0x0000, 0x1f59, 0x0301, 0x0000, 0x0000, 0x1f59, 0x0342, + 0x0ab2, 0x0ab2, 0x0ab5, 0x0ab5, 0x0ab8, 0x0ab8, 0x0abc, 0x0abc, + 0x0ac0, 0x0ac0, 0x0ac4, 0x0ac4, 0x0ac8, 0x0ac8, 0x0acc, 0x0acc, + 0x0000, 0x0000, 0x0ad0, 0x0ad0, 0x0000, 0x0000, 0x0ad3, 0x0ad3, + 0x0000, 0x0000, 0x0ad7, 0x0ad7, 0x0000, 0x0000, 0x0adb, 0x0adb, /* 0x1f60 .. 0x1f6f */ - 0x03c9, 0x0313, 0x03c9, 0x0314, 0x1f60, 0x0300, 0x1f61, 0x0300, - 0x1f60, 0x0301, 0x1f61, 0x0301, 0x1f60, 0x0342, 0x1f61, 0x0342, - 0x03a9, 0x0313, 0x03a9, 0x0314, 0x1f68, 0x0300, 0x1f69, 0x0300, - 0x1f68, 0x0301, 0x1f69, 0x0301, 0x1f68, 0x0342, 0x1f69, 0x0342, + 0x0adf, 0x0adf, 0x0ae2, 0x0ae2, 0x0ae5, 0x0ae5, 0x0ae9, 0x0ae9, + 0x0aed, 0x0aed, 0x0af1, 0x0af1, 0x0af5, 0x0af5, 0x0af9, 0x0af9, + 0x0afd, 0x0afd, 0x0b00, 0x0b00, 0x0b03, 0x0b03, 0x0b07, 0x0b07, + 0x0b0b, 0x0b0b, 0x0b0f, 0x0b0f, 0x0b13, 0x0b13, 0x0b17, 0x0b17, /* 0x1f70 .. 0x1f7f */ - 0x03b1, 0x0300, 0x0000, 0x0000, 0x03b5, 0x0300, 0x0000, 0x0000, - 0x03b7, 0x0300, 0x0000, 0x0000, 0x03b9, 0x0300, 0x0000, 0x0000, - 0x03bf, 0x0300, 0x0000, 0x0000, 0x03c5, 0x0300, 0x0000, 0x0000, - 0x03c9, 0x0300, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0b1b, 0x0b1b, 0x03cd, 0x03cd, 0x0b1e, 0x0b1e, 0x03d0, 0x03d0, + 0x0b21, 0x0b21, 0x03d3, 0x03d3, 0x0b24, 0x0b24, 0x03d6, 0x03d6, + 0x0b27, 0x0b27, 0x03e3, 0x03e3, 0x0b2a, 0x0b2a, 0x03e6, 0x03e6, + 0x0b2d, 0x0b2d, 0x03e9, 0x03e9, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1f80 .. 0x1f8f */ - 0x1f00, 0x0345, 0x1f01, 0x0345, 0x1f02, 0x0345, 0x1f03, 0x0345, - 0x1f04, 0x0345, 0x1f05, 0x0345, 0x1f06, 0x0345, 0x1f07, 0x0345, - 0x1f08, 0x0345, 0x1f09, 0x0345, 0x1f0a, 0x0345, 0x1f0b, 0x0345, - 0x1f0c, 0x0345, 0x1f0d, 0x0345, 0x1f0e, 0x0345, 0x1f0f, 0x0345, + 0x0b30, 0x0b30, 0x0b34, 0x0b34, 0x0b38, 0x0b38, 0x0b3d, 0x0b3d, + 0x0b42, 0x0b42, 0x0b47, 0x0b47, 0x0b4c, 0x0b4c, 0x0b51, 0x0b51, + 0x0b56, 0x0b56, 0x0b5a, 0x0b5a, 0x0b5e, 0x0b5e, 0x0b63, 0x0b63, + 0x0b68, 0x0b68, 0x0b6d, 0x0b6d, 0x0b72, 0x0b72, 0x0b77, 0x0b77, /* 0x1f90 .. 0x1f9f */ - 0x1f20, 0x0345, 0x1f21, 0x0345, 0x1f22, 0x0345, 0x1f23, 0x0345, - 0x1f24, 0x0345, 0x1f25, 0x0345, 0x1f26, 0x0345, 0x1f27, 0x0345, - 0x1f28, 0x0345, 0x1f29, 0x0345, 0x1f2a, 0x0345, 0x1f2b, 0x0345, - 0x1f2c, 0x0345, 0x1f2d, 0x0345, 0x1f2e, 0x0345, 0x1f2f, 0x0345, + 0x0b7c, 0x0b7c, 0x0b80, 0x0b80, 0x0b84, 0x0b84, 0x0b89, 0x0b89, + 0x0b8e, 0x0b8e, 0x0b93, 0x0b93, 0x0b98, 0x0b98, 0x0b9d, 0x0b9d, + 0x0ba2, 0x0ba2, 0x0ba6, 0x0ba6, 0x0baa, 0x0baa, 0x0baf, 0x0baf, + 0x0bb4, 0x0bb4, 0x0bb9, 0x0bb9, 0x0bbe, 0x0bbe, 0x0bc3, 0x0bc3, /* 0x1fa0 .. 0x1faf */ - 0x1f60, 0x0345, 0x1f61, 0x0345, 0x1f62, 0x0345, 0x1f63, 0x0345, - 0x1f64, 0x0345, 0x1f65, 0x0345, 0x1f66, 0x0345, 0x1f67, 0x0345, - 0x1f68, 0x0345, 0x1f69, 0x0345, 0x1f6a, 0x0345, 0x1f6b, 0x0345, - 0x1f6c, 0x0345, 0x1f6d, 0x0345, 0x1f6e, 0x0345, 0x1f6f, 0x0345, + 0x0bc8, 0x0bc8, 0x0bcc, 0x0bcc, 0x0bd0, 0x0bd0, 0x0bd5, 0x0bd5, + 0x0bda, 0x0bda, 0x0bdf, 0x0bdf, 0x0be4, 0x0be4, 0x0be9, 0x0be9, + 0x0bee, 0x0bee, 0x0bf2, 0x0bf2, 0x0bf6, 0x0bf6, 0x0bfb, 0x0bfb, + 0x0c00, 0x0c00, 0x0c05, 0x0c05, 0x0c0a, 0x0c0a, 0x0c0f, 0x0c0f, /* 0x1fb0 .. 0x1fbf */ - 0x03b1, 0x0306, 0x03b1, 0x0304, 0x1f70, 0x0345, 0x03b1, 0x0345, - 0x03ac, 0x0345, 0x0000, 0x0000, 0x03b1, 0x0342, 0x1fb6, 0x0345, - 0x0391, 0x0306, 0x0391, 0x0304, 0x0391, 0x0300, 0x0000, 0x0000, - 0x0391, 0x0345, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0c14, 0x0c14, 0x0c17, 0x0c17, 0x0c1a, 0x0c1a, 0x0c1e, 0x0c1e, + 0x0c21, 0x0c21, 0x0000, 0x0000, 0x0c25, 0x0c25, 0x0c28, 0x0c28, + 0x0c2c, 0x0c2c, 0x0c2f, 0x0c2f, 0x0c32, 0x0c32, 0x03ac, 0x03ac, + 0x0c35, 0x0c35, 0x0000, 0x0c38, 0x0c3b, 0x0c3b, 0x0000, 0x0c38, /* 0x1fc0 .. 0x1fcf */ - 0x0000, 0x0000, 0x00a8, 0x0342, 0x1f74, 0x0345, 0x03b7, 0x0345, - 0x03ae, 0x0345, 0x0000, 0x0000, 0x03b7, 0x0342, 0x1fc6, 0x0345, - 0x0395, 0x0300, 0x0000, 0x0000, 0x0397, 0x0300, 0x0000, 0x0000, - 0x0397, 0x0345, 0x1fbf, 0x0300, 0x1fbf, 0x0301, 0x1fbf, 0x0342, + 0x0000, 0x0c3d, 0x0c40, 0x0c43, 0x0c47, 0x0c47, 0x0c4b, 0x0c4b, + 0x0c4e, 0x0c4e, 0x0000, 0x0000, 0x0c52, 0x0c52, 0x0c55, 0x0c55, + 0x0c59, 0x0c59, 0x03b1, 0x03b1, 0x0c5c, 0x0c5c, 0x03b4, 0x03b4, + 0x0c5f, 0x0c5f, 0x0c62, 0x0c65, 0x0c69, 0x0c6c, 0x0c70, 0x0c73, /* 0x1fd0 .. 0x1fdf */ - 0x03b9, 0x0306, 0x03b9, 0x0304, 0x03ca, 0x0300, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x03b9, 0x0342, 0x03ca, 0x0342, - 0x0399, 0x0306, 0x0399, 0x0304, 0x0399, 0x0300, 0x0000, 0x0000, - 0x0000, 0x0000, 0x1ffe, 0x0300, 0x1ffe, 0x0301, 0x1ffe, 0x0342, + 0x0c77, 0x0c77, 0x0c7a, 0x0c7a, 0x0c7d, 0x0c7d, 0x03c3, 0x03c3, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0c81, 0x0c81, 0x0c84, 0x0c84, + 0x0c88, 0x0c88, 0x0c8b, 0x0c8b, 0x0c8e, 0x0c8e, 0x03b7, 0x03b7, + 0x0000, 0x0000, 0x0c91, 0x0c94, 0x0c98, 0x0c9b, 0x0c9f, 0x0ca2, /* 0x1fe0 .. 0x1fef */ - 0x03c5, 0x0306, 0x03c5, 0x0304, 0x03cb, 0x0300, 0x0000, 0x0000, - 0x03c1, 0x0313, 0x03c1, 0x0314, 0x03c5, 0x0342, 0x03cb, 0x0342, - 0x03a5, 0x0306, 0x03a5, 0x0304, 0x03a5, 0x0300, 0x0000, 0x0000, - 0x03a1, 0x0314, 0x00a8, 0x0300, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0ca6, 0x0ca6, 0x0ca9, 0x0ca9, 0x0cac, 0x0cac, 0x03d9, 0x03d9, + 0x0cb0, 0x0cb0, 0x0cb3, 0x0cb3, 0x0cb6, 0x0cb6, 0x0cb9, 0x0cb9, + 0x0cbd, 0x0cbd, 0x0cc0, 0x0cc0, 0x0cc3, 0x0cc3, 0x03bd, 0x03bd, + 0x0cc6, 0x0cc6, 0x0cc9, 0x0ccc, 0x03a5, 0x03a8, 0x0cd0, 0x0cd0, /* 0x1ff0 .. 0x1fff */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x1f7c, 0x0345, 0x03c9, 0x0345, - 0x03ce, 0x0345, 0x0000, 0x0000, 0x03c9, 0x0342, 0x1ff6, 0x0345, - 0x039f, 0x0300, 0x0000, 0x0000, 0x03a9, 0x0300, 0x0000, 0x0000, - 0x03a9, 0x0345, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0cd2, 0x0cd2, 0x0cd6, 0x0cd6, + 0x0cd9, 0x0cd9, 0x0000, 0x0000, 0x0cdd, 0x0cdd, 0x0ce0, 0x0ce0, + 0x0ce4, 0x0ce4, 0x03ba, 0x03ba, 0x0ce7, 0x0ce7, 0x03c0, 0x03c0, + 0x0cea, 0x0cea, 0x0ced, 0x000f, 0x0000, 0x0cef, 0x0000, 0x0000, + /* 0x2000 .. 0x200f */ + 0x0cf2, 0x0001, 0x0cf4, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2010 .. 0x201f */ + 0x0000, 0x0000, 0x0000, 0x0cf6, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0cf8, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2020 .. 0x202f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0cfb, 0x0000, 0x0cfd, 0x0000, 0x0d00, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, + /* 0x2030 .. 0x203f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0d04, + 0x0000, 0x0d07, 0x0000, 0x0000, 0x0000, 0x0d0b, 0x0000, 0x0d0e, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0d12, 0x0000, 0x0000, 0x0000, 0x0d15, 0x0000, 0x0000, + /* 0x2040 .. 0x204f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0d18, + 0x0000, 0x0d1b, 0x0000, 0x0d1e, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2050 .. 0x205f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0d21, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, + /* 0x2070 .. 0x207f */ + 0x0000, 0x0d26, 0x0000, 0x061e, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0d28, 0x0000, 0x0d2a, 0x0000, 0x0d2c, 0x0000, 0x0d2e, + 0x0000, 0x0d30, 0x0000, 0x0d32, 0x0000, 0x0d34, 0x0000, 0x0d36, + 0x0000, 0x0d38, 0x0000, 0x0d3a, 0x0000, 0x0d3c, 0x0000, 0x0d3e, + /* 0x2080 .. 0x208f */ + 0x0000, 0x0d26, 0x0000, 0x0017, 0x0000, 0x000b, 0x0000, 0x000d, + 0x0000, 0x0d28, 0x0000, 0x0d2a, 0x0000, 0x0d2c, 0x0000, 0x0d2e, + 0x0000, 0x0d30, 0x0000, 0x0d32, 0x0000, 0x0d34, 0x0000, 0x0d36, + 0x0000, 0x0d38, 0x0000, 0x0d3a, 0x0000, 0x0d3c, 0x0000, 0x0000, + /* 0x2090 .. 0x209f */ + 0x0000, 0x0006, 0x0000, 0x05f4, 0x0000, 0x0019, 0x0000, 0x0391, + 0x0000, 0x05f6, 0x0000, 0x0369, 0x0000, 0x05fe, 0x0000, 0x038f, + 0x0000, 0x0600, 0x0000, 0x0d3e, 0x0000, 0x060a, 0x0000, 0x0219, + 0x0000, 0x060c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x20a0 .. 0x20af */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0d40, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2100 .. 0x210f */ + 0x0000, 0x0d43, 0x0000, 0x0d47, 0x0000, 0x0d4b, 0x0000, 0x0d4d, + 0x0000, 0x0000, 0x0000, 0x0d50, 0x0000, 0x0d54, 0x0000, 0x0d58, + 0x0000, 0x0000, 0x0000, 0x0d5a, 0x0000, 0x05fc, 0x0000, 0x05ce, + 0x0000, 0x05ce, 0x0000, 0x05ce, 0x0000, 0x0369, 0x0000, 0x0d5d, + /* 0x2110 .. 0x211f */ + 0x0000, 0x05d0, 0x0000, 0x05d0, 0x0000, 0x05d6, 0x0000, 0x038f, + 0x0000, 0x0000, 0x0000, 0x05da, 0x0000, 0x0d5f, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x05e0, 0x0000, 0x0d62, 0x0000, 0x05e2, + 0x0000, 0x05e2, 0x0000, 0x05e2, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2120 .. 0x212f */ + 0x0000, 0x0d64, 0x0000, 0x0d67, 0x0000, 0x0d6b, 0x0000, 0x0000, + 0x0000, 0x0d6e, 0x0000, 0x0000, 0x0d70, 0x0d70, 0x0000, 0x0000, + 0x0000, 0x0d6e, 0x0000, 0x0000, 0x05d4, 0x05d4, 0x0036, 0x0036, + 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x0000, 0x0000, 0x05f4, + /* 0x2130 .. 0x213f */ + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x0000, 0x0000, 0x05d8, + 0x0000, 0x0019, 0x0000, 0x0d74, 0x0000, 0x0d76, 0x0000, 0x0d78, + 0x0000, 0x0d7a, 0x0000, 0x061e, 0x0000, 0x0000, 0x0000, 0x0d7c, + 0x0000, 0x03fa, 0x0000, 0x0618, 0x0000, 0x0d80, 0x0000, 0x0d82, + /* 0x2140 .. 0x214f */ + 0x0000, 0x0d84, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x05c6, 0x0000, 0x05f2, 0x0000, 0x05f4, + 0x0000, 0x061e, 0x0000, 0x036d, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2150 .. 0x215f */ + 0x0000, 0x0d86, 0x0000, 0x0d8a, 0x0000, 0x0d8e, 0x0000, 0x0d93, + 0x0000, 0x0d97, 0x0000, 0x0d9b, 0x0000, 0x0d9f, 0x0000, 0x0da3, + 0x0000, 0x0da7, 0x0000, 0x0dab, 0x0000, 0x0daf, 0x0000, 0x0db3, + 0x0000, 0x0db7, 0x0000, 0x0dbb, 0x0000, 0x0dbf, 0x0000, 0x0dc3, + /* 0x2160 .. 0x216f */ + 0x0000, 0x05d0, 0x0000, 0x0dc6, 0x0000, 0x0dc9, 0x0000, 0x0dcd, + 0x0000, 0x0dd0, 0x0000, 0x0dd2, 0x0000, 0x0dd5, 0x0000, 0x0dd9, + 0x0000, 0x0dde, 0x0000, 0x0de1, 0x0000, 0x0de3, 0x0000, 0x0de6, + 0x0000, 0x05d6, 0x0000, 0x0d4b, 0x0000, 0x05c6, 0x0000, 0x05d8, + /* 0x2170 .. 0x217f */ + 0x0000, 0x061e, 0x0000, 0x0dea, 0x0000, 0x0ded, 0x0000, 0x0df1, + 0x0000, 0x0614, 0x0000, 0x0df4, 0x0000, 0x0df7, 0x0000, 0x0dfb, + 0x0000, 0x0e00, 0x0000, 0x0391, 0x0000, 0x0e03, 0x0000, 0x0e06, + 0x0000, 0x038f, 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x0600, + /* 0x2180 .. 0x218f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0e0a, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2190 .. 0x219f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x2190, 0x0338, 0x2192, 0x0338, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0e0e, 0x0e0e, 0x0e11, 0x0e11, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x21a0 .. 0x21af */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x2194, 0x0338, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0e14, 0x0e14, 0x0000, 0x0000, /* 0x21c0 .. 0x21cf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x21d0, 0x0338, 0x21d4, 0x0338, 0x21d2, 0x0338, + 0x0000, 0x0000, 0x0e17, 0x0e17, 0x0e1a, 0x0e1a, 0x0e1d, 0x0e1d, /* 0x2200 .. 0x220f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2203, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x2208, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x220b, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0e20, 0x0e20, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0e23, 0x0e23, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0e26, 0x0e26, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2220 .. 0x222f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2223, 0x0338, 0x0000, 0x0000, 0x2225, 0x0338, 0x0000, 0x0000, + 0x0e29, 0x0e29, 0x0000, 0x0000, 0x0e2c, 0x0e2c, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0e2f, 0x0000, 0x0e32, 0x0000, 0x0000, 0x0000, 0x0e36, + /* 0x2230 .. 0x223f */ + 0x0000, 0x0e39, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2240 .. 0x224f */ - 0x0000, 0x0000, 0x223c, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2243, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, 0x2245, 0x0338, - 0x0000, 0x0000, 0x2248, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0e3d, 0x0e3d, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0e40, 0x0e40, 0x0000, 0x0000, 0x0000, 0x0000, 0x0e43, 0x0e43, + 0x0000, 0x0000, 0x0e46, 0x0e46, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2260 .. 0x226f */ - 0x003d, 0x0338, 0x0000, 0x0000, 0x2261, 0x0338, 0x0000, 0x0000, + 0x0e49, 0x0e49, 0x0000, 0x0000, 0x0e4c, 0x0e4c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x224d, 0x0338, 0x003c, 0x0338, 0x003e, 0x0338, + 0x0000, 0x0000, 0x0e4f, 0x0e4f, 0x0e52, 0x0e52, 0x0e55, 0x0e55, /* 0x2270 .. 0x227f */ - 0x2264, 0x0338, 0x2265, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2272, 0x0338, 0x2273, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2276, 0x0338, 0x2277, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0e58, 0x0e58, 0x0e5b, 0x0e5b, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0e5e, 0x0e5e, 0x0e61, 0x0e61, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0e64, 0x0e64, 0x0e67, 0x0e67, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2280 .. 0x228f */ - 0x227a, 0x0338, 0x227b, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2282, 0x0338, 0x2283, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2286, 0x0338, 0x2287, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0e6a, 0x0e6a, 0x0e6d, 0x0e6d, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0e70, 0x0e70, 0x0e73, 0x0e73, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0e76, 0x0e76, 0x0e79, 0x0e79, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x22a0 .. 0x22af */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x22a2, 0x0338, 0x22a8, 0x0338, 0x22a9, 0x0338, 0x22ab, 0x0338, + 0x0e7c, 0x0e7c, 0x0e7f, 0x0e7f, 0x0e82, 0x0e82, 0x0e85, 0x0e85, /* 0x22e0 .. 0x22ef */ - 0x227c, 0x0338, 0x227d, 0x0338, 0x2291, 0x0338, 0x2292, 0x0338, + 0x0e88, 0x0e88, 0x0e8b, 0x0e8b, 0x0e8e, 0x0e8e, 0x0e91, 0x0e91, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0e94, 0x0e94, 0x0e97, 0x0e97, + 0x0e9a, 0x0e9a, 0x0e9d, 0x0e9d, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2320 .. 0x232f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0ea0, 0x0ea0, 0x0ea2, 0x0ea2, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2460 .. 0x246f */ + 0x0000, 0x0017, 0x0000, 0x000b, 0x0000, 0x000d, 0x0000, 0x0d28, + 0x0000, 0x0d2a, 0x0000, 0x0d2c, 0x0000, 0x0d2e, 0x0000, 0x0d30, + 0x0000, 0x0d32, 0x0000, 0x0ea4, 0x0000, 0x0ea7, 0x0000, 0x0eaa, + 0x0000, 0x0ead, 0x0000, 0x0eb0, 0x0000, 0x0eb3, 0x0000, 0x0eb6, + /* 0x2470 .. 0x247f */ + 0x0000, 0x0eb9, 0x0000, 0x0ebc, 0x0000, 0x0ebf, 0x0000, 0x0ec2, + 0x0000, 0x0ec5, 0x0000, 0x0ec9, 0x0000, 0x0ecd, 0x0000, 0x0ed1, + 0x0000, 0x0ed5, 0x0000, 0x0ed9, 0x0000, 0x0edd, 0x0000, 0x0ee1, + 0x0000, 0x0ee5, 0x0000, 0x0ee9, 0x0000, 0x0eee, 0x0000, 0x0ef3, + /* 0x2480 .. 0x248f */ + 0x0000, 0x0ef8, 0x0000, 0x0efd, 0x0000, 0x0f02, 0x0000, 0x0f07, + 0x0000, 0x0f0c, 0x0000, 0x0f11, 0x0000, 0x0f16, 0x0000, 0x0f1b, + 0x0000, 0x0f20, 0x0000, 0x0f23, 0x0000, 0x0f26, 0x0000, 0x0f29, + 0x0000, 0x0f2c, 0x0000, 0x0f2f, 0x0000, 0x0f32, 0x0000, 0x0f35, + /* 0x2490 .. 0x249f */ + 0x0000, 0x0f38, 0x0000, 0x0f3b, 0x0000, 0x0f3f, 0x0000, 0x0f43, + 0x0000, 0x0f47, 0x0000, 0x0f4b, 0x0000, 0x0f4f, 0x0000, 0x0f53, + 0x0000, 0x0f57, 0x0000, 0x0f5b, 0x0000, 0x0f5f, 0x0000, 0x0f63, + 0x0000, 0x0f67, 0x0000, 0x0f6b, 0x0000, 0x0f6f, 0x0000, 0x0f73, + /* 0x24a0 .. 0x24af */ + 0x0000, 0x0f77, 0x0000, 0x0f7b, 0x0000, 0x0f7f, 0x0000, 0x0f83, + 0x0000, 0x0f87, 0x0000, 0x0f8b, 0x0000, 0x0f8f, 0x0000, 0x0f93, + 0x0000, 0x0f97, 0x0000, 0x0f9b, 0x0000, 0x0f9f, 0x0000, 0x0fa3, + 0x0000, 0x0fa7, 0x0000, 0x0fab, 0x0000, 0x0faf, 0x0000, 0x0fb3, + /* 0x24b0 .. 0x24bf */ + 0x0000, 0x0fb7, 0x0000, 0x0fbb, 0x0000, 0x0fbf, 0x0000, 0x0fc3, + 0x0000, 0x0fc7, 0x0000, 0x0fcb, 0x0000, 0x05c0, 0x0000, 0x05c4, + 0x0000, 0x0d4b, 0x0000, 0x05c6, 0x0000, 0x05c8, 0x0000, 0x0d72, + 0x0000, 0x05cc, 0x0000, 0x05ce, 0x0000, 0x05d0, 0x0000, 0x05d2, + /* 0x24c0 .. 0x24cf */ + 0x0000, 0x05d4, 0x0000, 0x05d6, 0x0000, 0x05d8, 0x0000, 0x05da, + 0x0000, 0x05dc, 0x0000, 0x05e0, 0x0000, 0x0d62, 0x0000, 0x05e2, + 0x0000, 0x0fcf, 0x0000, 0x05e4, 0x0000, 0x05e6, 0x0000, 0x0dd0, + 0x0000, 0x05e8, 0x0000, 0x0de1, 0x0000, 0x0fd1, 0x0000, 0x0d6e, + /* 0x24d0 .. 0x24df */ + 0x0000, 0x0006, 0x0000, 0x05f0, 0x0000, 0x0624, 0x0000, 0x05f2, + 0x0000, 0x05f4, 0x0000, 0x062a, 0x0000, 0x05fc, 0x0000, 0x0369, + 0x0000, 0x061e, 0x0000, 0x036d, 0x0000, 0x05fe, 0x0000, 0x038f, + 0x0000, 0x0600, 0x0000, 0x0d3e, 0x0000, 0x0019, 0x0000, 0x060a, + /* 0x24e0 .. 0x24ef */ + 0x0000, 0x0fd3, 0x0000, 0x036f, 0x0000, 0x0219, 0x0000, 0x060c, + 0x0000, 0x060e, 0x0000, 0x0614, 0x0000, 0x0377, 0x0000, 0x0391, + 0x0000, 0x0379, 0x0000, 0x0660, 0x0000, 0x0d26, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2a00 .. 0x2a0f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0fd5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2a70 .. 0x2a7f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0fda, 0x0000, 0x0fde, 0x0000, 0x0fe1, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x22b2, 0x0338, 0x22b3, 0x0338, - 0x22b4, 0x0338, 0x22b5, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2ad0 .. 0x2adf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x2add, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0fe5, 0x0fe5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2c70 .. 0x2c7f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x036d, 0x0000, 0x0dd0, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2d60 .. 0x2d6f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0fe8, + /* 0x2e90 .. 0x2e9f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0fea, + /* 0x2ef0 .. 0x2eff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0fec, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2f00 .. 0x2f0f */ + 0x0000, 0x0fee, 0x0000, 0x0ff0, 0x0000, 0x0ff2, 0x0000, 0x0ff4, + 0x0000, 0x0ff6, 0x0000, 0x0ff8, 0x0000, 0x0ffa, 0x0000, 0x0ffc, + 0x0000, 0x0ffe, 0x0000, 0x1000, 0x0000, 0x1002, 0x0000, 0x1004, + 0x0000, 0x1006, 0x0000, 0x1008, 0x0000, 0x100a, 0x0000, 0x100c, + /* 0x2f10 .. 0x2f1f */ + 0x0000, 0x100e, 0x0000, 0x1010, 0x0000, 0x1012, 0x0000, 0x1014, + 0x0000, 0x1016, 0x0000, 0x1018, 0x0000, 0x101a, 0x0000, 0x101c, + 0x0000, 0x101e, 0x0000, 0x1020, 0x0000, 0x1022, 0x0000, 0x1024, + 0x0000, 0x1026, 0x0000, 0x1028, 0x0000, 0x102a, 0x0000, 0x102c, + /* 0x2f20 .. 0x2f2f */ + 0x0000, 0x102e, 0x0000, 0x1030, 0x0000, 0x1032, 0x0000, 0x1034, + 0x0000, 0x1036, 0x0000, 0x1038, 0x0000, 0x103a, 0x0000, 0x103c, + 0x0000, 0x103e, 0x0000, 0x1040, 0x0000, 0x1042, 0x0000, 0x1044, + 0x0000, 0x1046, 0x0000, 0x1048, 0x0000, 0x104a, 0x0000, 0x104c, + /* 0x2f30 .. 0x2f3f */ + 0x0000, 0x104e, 0x0000, 0x1050, 0x0000, 0x1052, 0x0000, 0x1054, + 0x0000, 0x1056, 0x0000, 0x1058, 0x0000, 0x105a, 0x0000, 0x105c, + 0x0000, 0x105e, 0x0000, 0x1060, 0x0000, 0x1062, 0x0000, 0x1064, + 0x0000, 0x1066, 0x0000, 0x1068, 0x0000, 0x106a, 0x0000, 0x106c, + /* 0x2f40 .. 0x2f4f */ + 0x0000, 0x106e, 0x0000, 0x1070, 0x0000, 0x1072, 0x0000, 0x1074, + 0x0000, 0x1076, 0x0000, 0x1078, 0x0000, 0x107a, 0x0000, 0x107c, + 0x0000, 0x107e, 0x0000, 0x1080, 0x0000, 0x1082, 0x0000, 0x1084, + 0x0000, 0x1086, 0x0000, 0x1088, 0x0000, 0x108a, 0x0000, 0x108c, + /* 0x2f50 .. 0x2f5f */ + 0x0000, 0x108e, 0x0000, 0x1090, 0x0000, 0x1092, 0x0000, 0x1094, + 0x0000, 0x1096, 0x0000, 0x1098, 0x0000, 0x109a, 0x0000, 0x109c, + 0x0000, 0x109e, 0x0000, 0x10a0, 0x0000, 0x10a2, 0x0000, 0x10a4, + 0x0000, 0x10a6, 0x0000, 0x10a8, 0x0000, 0x10aa, 0x0000, 0x10ac, + /* 0x2f60 .. 0x2f6f */ + 0x0000, 0x10ae, 0x0000, 0x10b0, 0x0000, 0x10b2, 0x0000, 0x10b4, + 0x0000, 0x10b6, 0x0000, 0x10b8, 0x0000, 0x10ba, 0x0000, 0x10bc, + 0x0000, 0x10be, 0x0000, 0x10c0, 0x0000, 0x10c2, 0x0000, 0x10c4, + 0x0000, 0x10c6, 0x0000, 0x10c8, 0x0000, 0x10ca, 0x0000, 0x10cc, + /* 0x2f70 .. 0x2f7f */ + 0x0000, 0x10ce, 0x0000, 0x10d0, 0x0000, 0x10d2, 0x0000, 0x10d4, + 0x0000, 0x10d6, 0x0000, 0x10d8, 0x0000, 0x10da, 0x0000, 0x10dc, + 0x0000, 0x10de, 0x0000, 0x10e0, 0x0000, 0x10e2, 0x0000, 0x10e4, + 0x0000, 0x10e6, 0x0000, 0x10e8, 0x0000, 0x10ea, 0x0000, 0x10ec, + /* 0x2f80 .. 0x2f8f */ + 0x0000, 0x10ee, 0x0000, 0x10f0, 0x0000, 0x10f2, 0x0000, 0x10f4, + 0x0000, 0x10f6, 0x0000, 0x10f8, 0x0000, 0x10fa, 0x0000, 0x10fc, + 0x0000, 0x10fe, 0x0000, 0x1100, 0x0000, 0x1102, 0x0000, 0x1104, + 0x0000, 0x1106, 0x0000, 0x1108, 0x0000, 0x110a, 0x0000, 0x110c, + /* 0x2f90 .. 0x2f9f */ + 0x0000, 0x110e, 0x0000, 0x1110, 0x0000, 0x1112, 0x0000, 0x1114, + 0x0000, 0x1116, 0x0000, 0x1118, 0x0000, 0x111a, 0x0000, 0x111c, + 0x0000, 0x111e, 0x0000, 0x1120, 0x0000, 0x1122, 0x0000, 0x1124, + 0x0000, 0x1126, 0x0000, 0x1128, 0x0000, 0x112a, 0x0000, 0x112c, + /* 0x2fa0 .. 0x2faf */ + 0x0000, 0x112e, 0x0000, 0x1130, 0x0000, 0x1132, 0x0000, 0x1134, + 0x0000, 0x1136, 0x0000, 0x1138, 0x0000, 0x113a, 0x0000, 0x113c, + 0x0000, 0x113e, 0x0000, 0x1140, 0x0000, 0x1142, 0x0000, 0x1144, + 0x0000, 0x1146, 0x0000, 0x1148, 0x0000, 0x114a, 0x0000, 0x114c, + /* 0x2fb0 .. 0x2fbf */ + 0x0000, 0x114e, 0x0000, 0x1150, 0x0000, 0x1152, 0x0000, 0x1154, + 0x0000, 0x1156, 0x0000, 0x1158, 0x0000, 0x115a, 0x0000, 0x115c, + 0x0000, 0x115e, 0x0000, 0x1160, 0x0000, 0x1162, 0x0000, 0x1164, + 0x0000, 0x1166, 0x0000, 0x1168, 0x0000, 0x116a, 0x0000, 0x116c, + /* 0x2fc0 .. 0x2fcf */ + 0x0000, 0x116e, 0x0000, 0x1170, 0x0000, 0x1172, 0x0000, 0x1174, + 0x0000, 0x1176, 0x0000, 0x1178, 0x0000, 0x117a, 0x0000, 0x117c, + 0x0000, 0x117e, 0x0000, 0x1180, 0x0000, 0x1182, 0x0000, 0x1184, + 0x0000, 0x1186, 0x0000, 0x1188, 0x0000, 0x118a, 0x0000, 0x118c, + /* 0x2fd0 .. 0x2fdf */ + 0x0000, 0x118e, 0x0000, 0x1190, 0x0000, 0x1192, 0x0000, 0x1194, + 0x0000, 0x1196, 0x0000, 0x1198, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x3000 .. 0x300f */ + 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x3030 .. 0x303f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x119a, 0x0000, 0x0000, + 0x0000, 0x101c, 0x0000, 0x119c, 0x0000, 0x119e, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x3040 .. 0x304f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x304b, 0x3099, 0x0000, 0x0000, 0x304d, 0x3099, 0x0000, 0x0000, + 0x11a0, 0x11a0, 0x0000, 0x0000, 0x11a3, 0x11a3, 0x0000, 0x0000, /* 0x3050 .. 0x305f */ - 0x304f, 0x3099, 0x0000, 0x0000, 0x3051, 0x3099, 0x0000, 0x0000, - 0x3053, 0x3099, 0x0000, 0x0000, 0x3055, 0x3099, 0x0000, 0x0000, - 0x3057, 0x3099, 0x0000, 0x0000, 0x3059, 0x3099, 0x0000, 0x0000, - 0x305b, 0x3099, 0x0000, 0x0000, 0x305d, 0x3099, 0x0000, 0x0000, + 0x11a6, 0x11a6, 0x0000, 0x0000, 0x11a9, 0x11a9, 0x0000, 0x0000, + 0x11ac, 0x11ac, 0x0000, 0x0000, 0x11af, 0x11af, 0x0000, 0x0000, + 0x11b2, 0x11b2, 0x0000, 0x0000, 0x11b5, 0x11b5, 0x0000, 0x0000, + 0x11b8, 0x11b8, 0x0000, 0x0000, 0x11bb, 0x11bb, 0x0000, 0x0000, /* 0x3060 .. 0x306f */ - 0x305f, 0x3099, 0x0000, 0x0000, 0x3061, 0x3099, 0x0000, 0x0000, - 0x0000, 0x0000, 0x3064, 0x3099, 0x0000, 0x0000, 0x3066, 0x3099, - 0x0000, 0x0000, 0x3068, 0x3099, 0x0000, 0x0000, 0x0000, 0x0000, + 0x11be, 0x11be, 0x0000, 0x0000, 0x11c1, 0x11c1, 0x0000, 0x0000, + 0x0000, 0x0000, 0x11c4, 0x11c4, 0x0000, 0x0000, 0x11c7, 0x11c7, + 0x0000, 0x0000, 0x11ca, 0x11ca, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x3070 .. 0x307f */ - 0x306f, 0x3099, 0x306f, 0x309a, 0x0000, 0x0000, 0x3072, 0x3099, - 0x3072, 0x309a, 0x0000, 0x0000, 0x3075, 0x3099, 0x3075, 0x309a, - 0x0000, 0x0000, 0x3078, 0x3099, 0x3078, 0x309a, 0x0000, 0x0000, - 0x307b, 0x3099, 0x307b, 0x309a, 0x0000, 0x0000, 0x0000, 0x0000, + 0x11cd, 0x11cd, 0x11d0, 0x11d0, 0x0000, 0x0000, 0x11d3, 0x11d3, + 0x11d6, 0x11d6, 0x0000, 0x0000, 0x11d9, 0x11d9, 0x11dc, 0x11dc, + 0x0000, 0x0000, 0x11df, 0x11df, 0x11e2, 0x11e2, 0x0000, 0x0000, + 0x11e5, 0x11e5, 0x11e8, 0x11e8, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x3090 .. 0x309f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x3046, 0x3099, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x309d, 0x3099, 0x0000, 0x0000, + 0x11eb, 0x11eb, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x11ee, + 0x0000, 0x11f1, 0x0000, 0x0000, 0x11f4, 0x11f4, 0x0000, 0x11f7, /* 0x30a0 .. 0x30af */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x30ab, 0x3099, 0x0000, 0x0000, 0x30ad, 0x3099, 0x0000, 0x0000, + 0x11fa, 0x11fa, 0x0000, 0x0000, 0x11fd, 0x11fd, 0x0000, 0x0000, /* 0x30b0 .. 0x30bf */ - 0x30af, 0x3099, 0x0000, 0x0000, 0x30b1, 0x3099, 0x0000, 0x0000, - 0x30b3, 0x3099, 0x0000, 0x0000, 0x30b5, 0x3099, 0x0000, 0x0000, - 0x30b7, 0x3099, 0x0000, 0x0000, 0x30b9, 0x3099, 0x0000, 0x0000, - 0x30bb, 0x3099, 0x0000, 0x0000, 0x30bd, 0x3099, 0x0000, 0x0000, + 0x1200, 0x1200, 0x0000, 0x0000, 0x1203, 0x1203, 0x0000, 0x0000, + 0x1206, 0x1206, 0x0000, 0x0000, 0x1209, 0x1209, 0x0000, 0x0000, + 0x120c, 0x120c, 0x0000, 0x0000, 0x120f, 0x120f, 0x0000, 0x0000, + 0x1212, 0x1212, 0x0000, 0x0000, 0x1215, 0x1215, 0x0000, 0x0000, /* 0x30c0 .. 0x30cf */ - 0x30bf, 0x3099, 0x0000, 0x0000, 0x30c1, 0x3099, 0x0000, 0x0000, - 0x0000, 0x0000, 0x30c4, 0x3099, 0x0000, 0x0000, 0x30c6, 0x3099, - 0x0000, 0x0000, 0x30c8, 0x3099, 0x0000, 0x0000, 0x0000, 0x0000, + 0x1218, 0x1218, 0x0000, 0x0000, 0x121b, 0x121b, 0x0000, 0x0000, + 0x0000, 0x0000, 0x121e, 0x121e, 0x0000, 0x0000, 0x1221, 0x1221, + 0x0000, 0x0000, 0x1224, 0x1224, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x30d0 .. 0x30df */ - 0x30cf, 0x3099, 0x30cf, 0x309a, 0x0000, 0x0000, 0x30d2, 0x3099, - 0x30d2, 0x309a, 0x0000, 0x0000, 0x30d5, 0x3099, 0x30d5, 0x309a, - 0x0000, 0x0000, 0x30d8, 0x3099, 0x30d8, 0x309a, 0x0000, 0x0000, - 0x30db, 0x3099, 0x30db, 0x309a, 0x0000, 0x0000, 0x0000, 0x0000, + 0x1227, 0x1227, 0x122a, 0x122a, 0x0000, 0x0000, 0x122d, 0x122d, + 0x1230, 0x1230, 0x0000, 0x0000, 0x1233, 0x1233, 0x1236, 0x1236, + 0x0000, 0x0000, 0x1239, 0x1239, 0x123c, 0x123c, 0x0000, 0x0000, + 0x123f, 0x123f, 0x1242, 0x1242, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x30f0 .. 0x30ff */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x30a6, 0x3099, 0x0000, 0x0000, 0x0000, 0x0000, 0x30ef, 0x3099, - 0x30f0, 0x3099, 0x30f1, 0x3099, 0x30f2, 0x3099, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x30fd, 0x3099, 0x0000, 0x0000, + 0x1245, 0x1245, 0x0000, 0x0000, 0x0000, 0x0000, 0x1248, 0x1248, + 0x124b, 0x124b, 0x124e, 0x124e, 0x1251, 0x1251, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x1254, 0x1254, 0x0000, 0x1257, + /* 0x3130 .. 0x313f */ + 0x0000, 0x0000, 0x0000, 0x125a, 0x0000, 0x125c, 0x0000, 0x125e, + 0x0000, 0x1260, 0x0000, 0x1262, 0x0000, 0x1264, 0x0000, 0x1266, + 0x0000, 0x1268, 0x0000, 0x126a, 0x0000, 0x126c, 0x0000, 0x126e, + 0x0000, 0x1270, 0x0000, 0x1272, 0x0000, 0x1274, 0x0000, 0x1276, + /* 0x3140 .. 0x314f */ + 0x0000, 0x1278, 0x0000, 0x127a, 0x0000, 0x127c, 0x0000, 0x127e, + 0x0000, 0x1280, 0x0000, 0x1282, 0x0000, 0x1284, 0x0000, 0x1286, + 0x0000, 0x1288, 0x0000, 0x128a, 0x0000, 0x128c, 0x0000, 0x128e, + 0x0000, 0x1290, 0x0000, 0x1292, 0x0000, 0x1294, 0x0000, 0x1296, + /* 0x3150 .. 0x315f */ + 0x0000, 0x1298, 0x0000, 0x129a, 0x0000, 0x129c, 0x0000, 0x129e, + 0x0000, 0x12a0, 0x0000, 0x12a2, 0x0000, 0x12a4, 0x0000, 0x12a6, + 0x0000, 0x12a8, 0x0000, 0x12aa, 0x0000, 0x12ac, 0x0000, 0x12ae, + 0x0000, 0x12b0, 0x0000, 0x12b2, 0x0000, 0x12b4, 0x0000, 0x12b6, + /* 0x3160 .. 0x316f */ + 0x0000, 0x12b8, 0x0000, 0x12ba, 0x0000, 0x12bc, 0x0000, 0x12be, + 0x0000, 0x12c0, 0x0000, 0x12c2, 0x0000, 0x12c4, 0x0000, 0x12c6, + 0x0000, 0x12c8, 0x0000, 0x12ca, 0x0000, 0x12cc, 0x0000, 0x12ce, + 0x0000, 0x12d0, 0x0000, 0x12d2, 0x0000, 0x12d4, 0x0000, 0x12d6, + /* 0x3170 .. 0x317f */ + 0x0000, 0x12d8, 0x0000, 0x12da, 0x0000, 0x12dc, 0x0000, 0x12de, + 0x0000, 0x12e0, 0x0000, 0x12e2, 0x0000, 0x12e4, 0x0000, 0x12e6, + 0x0000, 0x12e8, 0x0000, 0x12ea, 0x0000, 0x12ec, 0x0000, 0x12ee, + 0x0000, 0x12f0, 0x0000, 0x12f2, 0x0000, 0x12f4, 0x0000, 0x12f6, + /* 0x3180 .. 0x318f */ + 0x0000, 0x12f8, 0x0000, 0x12fa, 0x0000, 0x12fc, 0x0000, 0x12fe, + 0x0000, 0x1300, 0x0000, 0x1302, 0x0000, 0x1304, 0x0000, 0x1306, + 0x0000, 0x1308, 0x0000, 0x130a, 0x0000, 0x130c, 0x0000, 0x130e, + 0x0000, 0x1310, 0x0000, 0x1312, 0x0000, 0x1314, 0x0000, 0x0000, + /* 0x3190 .. 0x319f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0fee, 0x0000, 0x0ffa, + 0x0000, 0x1316, 0x0000, 0x1318, 0x0000, 0x131a, 0x0000, 0x131c, + 0x0000, 0x131e, 0x0000, 0x1320, 0x0000, 0x0ff6, 0x0000, 0x1322, + 0x0000, 0x1324, 0x0000, 0x1326, 0x0000, 0x1328, 0x0000, 0x0ffe, + /* 0x3200 .. 0x320f */ + 0x0000, 0x132a, 0x0000, 0x132e, 0x0000, 0x1332, 0x0000, 0x1336, + 0x0000, 0x133a, 0x0000, 0x133e, 0x0000, 0x1342, 0x0000, 0x1346, + 0x0000, 0x134a, 0x0000, 0x134e, 0x0000, 0x1352, 0x0000, 0x1356, + 0x0000, 0x135a, 0x0000, 0x135e, 0x0000, 0x1362, 0x0000, 0x1367, + /* 0x3210 .. 0x321f */ + 0x0000, 0x136c, 0x0000, 0x1371, 0x0000, 0x1376, 0x0000, 0x137b, + 0x0000, 0x1380, 0x0000, 0x1385, 0x0000, 0x138a, 0x0000, 0x138f, + 0x0000, 0x1394, 0x0000, 0x1399, 0x0000, 0x139e, 0x0000, 0x13a3, + 0x0000, 0x13a8, 0x0000, 0x13ad, 0x0000, 0x13b5, 0x0000, 0x0000, + /* 0x3220 .. 0x322f */ + 0x0000, 0x13bc, 0x0000, 0x13c0, 0x0000, 0x13c4, 0x0000, 0x13c8, + 0x0000, 0x13cc, 0x0000, 0x13d0, 0x0000, 0x13d4, 0x0000, 0x13d8, + 0x0000, 0x13dc, 0x0000, 0x13e0, 0x0000, 0x13e4, 0x0000, 0x13e8, + 0x0000, 0x13ec, 0x0000, 0x13f0, 0x0000, 0x13f4, 0x0000, 0x13f8, + /* 0x3230 .. 0x323f */ + 0x0000, 0x13fc, 0x0000, 0x1400, 0x0000, 0x1404, 0x0000, 0x1408, + 0x0000, 0x140c, 0x0000, 0x1410, 0x0000, 0x1414, 0x0000, 0x1418, + 0x0000, 0x141c, 0x0000, 0x1420, 0x0000, 0x1424, 0x0000, 0x1428, + 0x0000, 0x142c, 0x0000, 0x1430, 0x0000, 0x1434, 0x0000, 0x1438, + /* 0x3240 .. 0x324f */ + 0x0000, 0x143c, 0x0000, 0x1440, 0x0000, 0x1444, 0x0000, 0x1448, + 0x0000, 0x144c, 0x0000, 0x144e, 0x0000, 0x1072, 0x0000, 0x1450, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x3250 .. 0x325f */ + 0x0000, 0x1452, 0x0000, 0x1456, 0x0000, 0x1459, 0x0000, 0x145c, + 0x0000, 0x145f, 0x0000, 0x1462, 0x0000, 0x1465, 0x0000, 0x1468, + 0x0000, 0x146b, 0x0000, 0x146e, 0x0000, 0x1471, 0x0000, 0x1474, + 0x0000, 0x1477, 0x0000, 0x147a, 0x0000, 0x147d, 0x0000, 0x1480, + /* 0x3260 .. 0x326f */ + 0x0000, 0x125a, 0x0000, 0x1260, 0x0000, 0x1266, 0x0000, 0x126a, + 0x0000, 0x127a, 0x0000, 0x127c, 0x0000, 0x1282, 0x0000, 0x1286, + 0x0000, 0x1288, 0x0000, 0x128c, 0x0000, 0x128e, 0x0000, 0x1290, + 0x0000, 0x1292, 0x0000, 0x1294, 0x0000, 0x1483, 0x0000, 0x1486, + /* 0x3270 .. 0x327f */ + 0x0000, 0x1489, 0x0000, 0x148c, 0x0000, 0x148f, 0x0000, 0x1492, + 0x0000, 0x1495, 0x0000, 0x1498, 0x0000, 0x149b, 0x0000, 0x149e, + 0x0000, 0x14a1, 0x0000, 0x14a4, 0x0000, 0x14a7, 0x0000, 0x14aa, + 0x0000, 0x14ad, 0x0000, 0x14b3, 0x0000, 0x14b8, 0x0000, 0x0000, + /* 0x3280 .. 0x328f */ + 0x0000, 0x0fee, 0x0000, 0x0ffa, 0x0000, 0x1316, 0x0000, 0x1318, + 0x0000, 0x14bb, 0x0000, 0x14bd, 0x0000, 0x14bf, 0x0000, 0x1004, + 0x0000, 0x14c1, 0x0000, 0x101c, 0x0000, 0x1080, 0x0000, 0x1098, + 0x0000, 0x1096, 0x0000, 0x1082, 0x0000, 0x113a, 0x0000, 0x102c, + /* 0x3290 .. 0x329f */ + 0x0000, 0x107c, 0x0000, 0x14c3, 0x0000, 0x14c5, 0x0000, 0x14c7, + 0x0000, 0x14c9, 0x0000, 0x14cb, 0x0000, 0x14cd, 0x0000, 0x14cf, + 0x0000, 0x14d1, 0x0000, 0x14d3, 0x0000, 0x14d5, 0x0000, 0x1038, + 0x0000, 0x14d7, 0x0000, 0x14d9, 0x0000, 0x14db, 0x0000, 0x14dd, + /* 0x32a0 .. 0x32af */ + 0x0000, 0x14df, 0x0000, 0x14e1, 0x0000, 0x14e3, 0x0000, 0x14e5, + 0x0000, 0x131a, 0x0000, 0x131c, 0x0000, 0x131e, 0x0000, 0x14e7, + 0x0000, 0x14e9, 0x0000, 0x14eb, 0x0000, 0x14ed, 0x0000, 0x14ef, + 0x0000, 0x14f1, 0x0000, 0x14f3, 0x0000, 0x14f5, 0x0000, 0x14f7, + /* 0x32b0 .. 0x32bf */ + 0x0000, 0x14f9, 0x0000, 0x14fb, 0x0000, 0x14fe, 0x0000, 0x1501, + 0x0000, 0x1504, 0x0000, 0x1507, 0x0000, 0x150a, 0x0000, 0x150d, + 0x0000, 0x1510, 0x0000, 0x1513, 0x0000, 0x1516, 0x0000, 0x1519, + 0x0000, 0x151c, 0x0000, 0x151f, 0x0000, 0x1522, 0x0000, 0x1525, + /* 0x32c0 .. 0x32cf */ + 0x0000, 0x1528, 0x0000, 0x152b, 0x0000, 0x152e, 0x0000, 0x1531, + 0x0000, 0x1534, 0x0000, 0x1537, 0x0000, 0x153a, 0x0000, 0x153d, + 0x0000, 0x1540, 0x0000, 0x1543, 0x0000, 0x1547, 0x0000, 0x154b, + 0x0000, 0x154f, 0x0000, 0x1552, 0x0000, 0x1556, 0x0000, 0x1559, + /* 0x32d0 .. 0x32df */ + 0x0000, 0x155d, 0x0000, 0x155f, 0x0000, 0x1561, 0x0000, 0x1563, + 0x0000, 0x1565, 0x0000, 0x1567, 0x0000, 0x1569, 0x0000, 0x156b, + 0x0000, 0x156d, 0x0000, 0x156f, 0x0000, 0x1571, 0x0000, 0x1573, + 0x0000, 0x1575, 0x0000, 0x1577, 0x0000, 0x1579, 0x0000, 0x157b, + /* 0x32e0 .. 0x32ef */ + 0x0000, 0x157d, 0x0000, 0x157f, 0x0000, 0x1581, 0x0000, 0x1583, + 0x0000, 0x1585, 0x0000, 0x1587, 0x0000, 0x1589, 0x0000, 0x158b, + 0x0000, 0x158d, 0x0000, 0x158f, 0x0000, 0x1591, 0x0000, 0x1593, + 0x0000, 0x1595, 0x0000, 0x1597, 0x0000, 0x1599, 0x0000, 0x159b, + /* 0x32f0 .. 0x32ff */ + 0x0000, 0x159d, 0x0000, 0x159f, 0x0000, 0x15a1, 0x0000, 0x15a3, + 0x0000, 0x15a5, 0x0000, 0x15a7, 0x0000, 0x15a9, 0x0000, 0x15ab, + 0x0000, 0x15ad, 0x0000, 0x15af, 0x0000, 0x15b1, 0x0000, 0x15b3, + 0x0000, 0x15b5, 0x0000, 0x15b7, 0x0000, 0x15b9, 0x0000, 0x0000, + /* 0x3300 .. 0x330f */ + 0x0000, 0x15bb, 0x0000, 0x15c1, 0x0000, 0x15c6, 0x0000, 0x15cc, + 0x0000, 0x15d0, 0x0000, 0x15d6, 0x0000, 0x15da, 0x0000, 0x15de, + 0x0000, 0x15e5, 0x0000, 0x15ea, 0x0000, 0x15ee, 0x0000, 0x15f2, + 0x0000, 0x15f6, 0x0000, 0x15fb, 0x0000, 0x1600, 0x0000, 0x1605, + /* 0x3310 .. 0x331f */ + 0x0000, 0x160a, 0x0000, 0x160f, 0x0000, 0x1614, 0x0000, 0x1619, + 0x0000, 0x1620, 0x0000, 0x1623, 0x0000, 0x162a, 0x0000, 0x1631, + 0x0000, 0x1637, 0x0000, 0x163c, 0x0000, 0x1643, 0x0000, 0x164a, + 0x0000, 0x164f, 0x0000, 0x1653, 0x0000, 0x1657, 0x0000, 0x165c, + /* 0x3320 .. 0x332f */ + 0x0000, 0x1661, 0x0000, 0x1667, 0x0000, 0x166d, 0x0000, 0x1671, + 0x0000, 0x1675, 0x0000, 0x167a, 0x0000, 0x167e, 0x0000, 0x1682, + 0x0000, 0x1685, 0x0000, 0x1688, 0x0000, 0x168c, 0x0000, 0x1690, + 0x0000, 0x1697, 0x0000, 0x169c, 0x0000, 0x16a2, 0x0000, 0x16a9, + /* 0x3330 .. 0x333f */ + 0x0000, 0x16ae, 0x0000, 0x16b2, 0x0000, 0x16b6, 0x0000, 0x16bd, + 0x0000, 0x16c2, 0x0000, 0x16c9, 0x0000, 0x16cd, 0x0000, 0x16d3, + 0x0000, 0x16d7, 0x0000, 0x16dc, 0x0000, 0x16e0, 0x0000, 0x16e5, + 0x0000, 0x16eb, 0x0000, 0x16f0, 0x0000, 0x16f6, 0x0000, 0x16fb, + /* 0x3340 .. 0x334f */ + 0x0000, 0x16fe, 0x0000, 0x1704, 0x0000, 0x1708, 0x0000, 0x170c, + 0x0000, 0x1711, 0x0000, 0x1715, 0x0000, 0x1719, 0x0000, 0x171d, + 0x0000, 0x1723, 0x0000, 0x1728, 0x0000, 0x172b, 0x0000, 0x1732, + 0x0000, 0x1736, 0x0000, 0x173c, 0x0000, 0x1741, 0x0000, 0x1746, + /* 0x3350 .. 0x335f */ + 0x0000, 0x174a, 0x0000, 0x174e, 0x0000, 0x1753, 0x0000, 0x1756, + 0x0000, 0x175b, 0x0000, 0x1761, 0x0000, 0x1764, 0x0000, 0x176b, + 0x0000, 0x176f, 0x0000, 0x1772, 0x0000, 0x1775, 0x0000, 0x1778, + 0x0000, 0x177b, 0x0000, 0x177e, 0x0000, 0x1781, 0x0000, 0x1784, + /* 0x3360 .. 0x336f */ + 0x0000, 0x1787, 0x0000, 0x178a, 0x0000, 0x178d, 0x0000, 0x1791, + 0x0000, 0x1795, 0x0000, 0x1799, 0x0000, 0x179d, 0x0000, 0x17a1, + 0x0000, 0x17a5, 0x0000, 0x17a9, 0x0000, 0x17ad, 0x0000, 0x17b1, + 0x0000, 0x17b5, 0x0000, 0x17b9, 0x0000, 0x17bd, 0x0000, 0x17c1, + /* 0x3370 .. 0x337f */ + 0x0000, 0x17c5, 0x0000, 0x17c9, 0x0000, 0x17cd, 0x0000, 0x17d0, + 0x0000, 0x17d3, 0x0000, 0x17d7, 0x0000, 0x17da, 0x0000, 0x17dd, + 0x0000, 0x17e0, 0x0000, 0x17e4, 0x0000, 0x17e8, 0x0000, 0x17eb, + 0x0000, 0x17ee, 0x0000, 0x17f1, 0x0000, 0x17f4, 0x0000, 0x17f7, + /* 0x3380 .. 0x338f */ + 0x0000, 0x17fc, 0x0000, 0x17ff, 0x0000, 0x1802, 0x0000, 0x1805, + 0x0000, 0x1808, 0x0000, 0x180b, 0x0000, 0x180e, 0x0000, 0x1811, + 0x0000, 0x1814, 0x0000, 0x1818, 0x0000, 0x181d, 0x0000, 0x1820, + 0x0000, 0x1823, 0x0000, 0x1826, 0x0000, 0x1829, 0x0000, 0x182c, + /* 0x3390 .. 0x339f */ + 0x0000, 0x182f, 0x0000, 0x1832, 0x0000, 0x1836, 0x0000, 0x183a, + 0x0000, 0x183e, 0x0000, 0x1842, 0x0000, 0x1845, 0x0000, 0x1848, + 0x0000, 0x184b, 0x0000, 0x184e, 0x0000, 0x1851, 0x0000, 0x1854, + 0x0000, 0x1857, 0x0000, 0x185a, 0x0000, 0x185d, 0x0000, 0x1860, + /* 0x33a0 .. 0x33af */ + 0x0000, 0x1864, 0x0000, 0x1868, 0x0000, 0x186b, 0x0000, 0x186f, + 0x0000, 0x1873, 0x0000, 0x1877, 0x0000, 0x187a, 0x0000, 0x187e, + 0x0000, 0x1882, 0x0000, 0x1887, 0x0000, 0x188a, 0x0000, 0x188e, + 0x0000, 0x1892, 0x0000, 0x1896, 0x0000, 0x189a, 0x0000, 0x18a0, + /* 0x33b0 .. 0x33bf */ + 0x0000, 0x18a7, 0x0000, 0x18aa, 0x0000, 0x18ad, 0x0000, 0x18b0, + 0x0000, 0x18b3, 0x0000, 0x18b6, 0x0000, 0x18b9, 0x0000, 0x18bc, + 0x0000, 0x18bf, 0x0000, 0x18c2, 0x0000, 0x18c5, 0x0000, 0x18c8, + 0x0000, 0x18cb, 0x0000, 0x18ce, 0x0000, 0x18d1, 0x0000, 0x18d4, + /* 0x33c0 .. 0x33cf */ + 0x0000, 0x18d7, 0x0000, 0x18da, 0x0000, 0x18dd, 0x0000, 0x18e2, + 0x0000, 0x18e5, 0x0000, 0x18e8, 0x0000, 0x18eb, 0x0000, 0x18f0, + 0x0000, 0x18f4, 0x0000, 0x18f7, 0x0000, 0x18fa, 0x0000, 0x18fd, + 0x0000, 0x1900, 0x0000, 0x1903, 0x0000, 0x1906, 0x0000, 0x1909, + /* 0x33d0 .. 0x33df */ + 0x0000, 0x190c, 0x0000, 0x190f, 0x0000, 0x1912, 0x0000, 0x1916, + 0x0000, 0x1919, 0x0000, 0x191c, 0x0000, 0x1920, 0x0000, 0x1924, + 0x0000, 0x1927, 0x0000, 0x192c, 0x0000, 0x1930, 0x0000, 0x1933, + 0x0000, 0x1936, 0x0000, 0x1939, 0x0000, 0x193c, 0x0000, 0x1940, + /* 0x33e0 .. 0x33ef */ + 0x0000, 0x1944, 0x0000, 0x1947, 0x0000, 0x194a, 0x0000, 0x194d, + 0x0000, 0x1950, 0x0000, 0x1953, 0x0000, 0x1956, 0x0000, 0x1959, + 0x0000, 0x195c, 0x0000, 0x195f, 0x0000, 0x1963, 0x0000, 0x1967, + 0x0000, 0x196b, 0x0000, 0x196f, 0x0000, 0x1973, 0x0000, 0x1977, + /* 0x33f0 .. 0x33ff */ + 0x0000, 0x197b, 0x0000, 0x197f, 0x0000, 0x1983, 0x0000, 0x1987, + 0x0000, 0x198b, 0x0000, 0x198f, 0x0000, 0x1993, 0x0000, 0x1997, + 0x0000, 0x199b, 0x0000, 0x199f, 0x0000, 0x19a3, 0x0000, 0x19a7, + 0x0000, 0x19ab, 0x0000, 0x19af, 0x0000, 0x19b3, 0x0000, 0x19b7, + /* 0xa690 .. 0xa69f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x19bb, 0x0000, 0x19bd, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xa770 .. 0xa77f */ + 0x0000, 0x19bf, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xa7f0 .. 0xa7ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x19c1, 0x0000, 0x19c3, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xab50 .. 0xab5f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x19c5, 0x0000, 0x19c7, 0x0000, 0x19c9, 0x0000, 0x19cb, + /* 0xf900 .. 0xf90f */ + 0x19cd, 0x19cd, 0x19cf, 0x19cf, 0x112a, 0x112a, 0x19d1, 0x19d1, + 0x19d3, 0x19d3, 0x19d5, 0x19d5, 0x19d7, 0x19d7, 0x1196, 0x1196, + 0x1196, 0x1196, 0x19d9, 0x19d9, 0x113a, 0x113a, 0x19db, 0x19db, + 0x19dd, 0x19dd, 0x19df, 0x19df, 0x19e1, 0x19e1, 0x19e3, 0x19e3, + /* 0xf910 .. 0xf91f */ + 0x19e5, 0x19e5, 0x19e7, 0x19e7, 0x19e9, 0x19e9, 0x19eb, 0x19eb, + 0x19ed, 0x19ed, 0x19ef, 0x19ef, 0x19f1, 0x19f1, 0x19f3, 0x19f3, + 0x19f5, 0x19f5, 0x19f7, 0x19f7, 0x19f9, 0x19f9, 0x19fb, 0x19fb, + 0x19fd, 0x19fd, 0x19ff, 0x19ff, 0x1a01, 0x1a01, 0x1a03, 0x1a03, + /* 0xf920 .. 0xf92f */ + 0x1a05, 0x1a05, 0x1a07, 0x1a07, 0x1a09, 0x1a09, 0x1a0b, 0x1a0b, + 0x1a0d, 0x1a0d, 0x1a0f, 0x1a0f, 0x1a11, 0x1a11, 0x1a13, 0x1a13, + 0x1a15, 0x1a15, 0x1a17, 0x1a17, 0x1a19, 0x1a19, 0x1a1b, 0x1a1b, + 0x1a1d, 0x1a1d, 0x1a1f, 0x1a1f, 0x1a21, 0x1a21, 0x1a23, 0x1a23, + /* 0xf930 .. 0xf93f */ + 0x1a25, 0x1a25, 0x1a27, 0x1a27, 0x1a29, 0x1a29, 0x1a2b, 0x1a2b, + 0x10e6, 0x10e6, 0x1a2d, 0x1a2d, 0x1a2f, 0x1a2f, 0x1a31, 0x1a31, + 0x1a33, 0x1a33, 0x1a35, 0x1a35, 0x1a37, 0x1a37, 0x1a39, 0x1a39, + 0x1a3b, 0x1a3b, 0x1a3d, 0x1a3d, 0x1a3f, 0x1a3f, 0x1a41, 0x1a41, + /* 0xf940 .. 0xf94f */ + 0x1178, 0x1178, 0x1a43, 0x1a43, 0x1a45, 0x1a45, 0x1a47, 0x1a47, + 0x1a49, 0x1a49, 0x1a4b, 0x1a4b, 0x1a4d, 0x1a4d, 0x1a4f, 0x1a4f, + 0x1a51, 0x1a51, 0x1a53, 0x1a53, 0x1a55, 0x1a55, 0x1a57, 0x1a57, + 0x1a59, 0x1a59, 0x1a5b, 0x1a5b, 0x1a5d, 0x1a5d, 0x1a5f, 0x1a5f, + /* 0xf950 .. 0xf95f */ + 0x1a61, 0x1a61, 0x1a63, 0x1a63, 0x1a65, 0x1a65, 0x1a67, 0x1a67, + 0x1a69, 0x1a69, 0x1a6b, 0x1a6b, 0x1a6d, 0x1a6d, 0x1a6f, 0x1a6f, + 0x1a71, 0x1a71, 0x1a73, 0x1a73, 0x1a75, 0x1a75, 0x1a77, 0x1a77, + 0x19ed, 0x19ed, 0x1a79, 0x1a79, 0x1a7b, 0x1a7b, 0x1a7d, 0x1a7d, + /* 0xf960 .. 0xf96f */ + 0x1a7f, 0x1a7f, 0x1a81, 0x1a81, 0x1a83, 0x1a83, 0x1a85, 0x1a85, + 0x1a87, 0x1a87, 0x1a89, 0x1a89, 0x1a8b, 0x1a8b, 0x1a8d, 0x1a8d, + 0x1a8f, 0x1a8f, 0x1a91, 0x1a91, 0x1a93, 0x1a93, 0x1a95, 0x1a95, + 0x1a97, 0x1a97, 0x1a99, 0x1a99, 0x1a9b, 0x1a9b, 0x1a9d, 0x1a9d, + /* 0xf970 .. 0xf97f */ + 0x1a9f, 0x1a9f, 0x112e, 0x112e, 0x1aa1, 0x1aa1, 0x1aa3, 0x1aa3, + 0x1aa5, 0x1aa5, 0x1aa7, 0x1aa7, 0x1aa9, 0x1aa9, 0x1aab, 0x1aab, + 0x1aad, 0x1aad, 0x1aaf, 0x1aaf, 0x1ab1, 0x1ab1, 0x1ab3, 0x1ab3, + 0x1ab5, 0x1ab5, 0x1ab7, 0x1ab7, 0x1ab9, 0x1ab9, 0x1abb, 0x1abb, + /* 0xf980 .. 0xf98f */ + 0x1abd, 0x1abd, 0x1038, 0x1038, 0x1abf, 0x1abf, 0x1ac1, 0x1ac1, + 0x1ac3, 0x1ac3, 0x1ac5, 0x1ac5, 0x1ac7, 0x1ac7, 0x1ac9, 0x1ac9, + 0x1acb, 0x1acb, 0x1acd, 0x1acd, 0x1012, 0x1012, 0x1acf, 0x1acf, + 0x1ad1, 0x1ad1, 0x1ad3, 0x1ad3, 0x1ad5, 0x1ad5, 0x1ad7, 0x1ad7, + /* 0xf990 .. 0xf99f */ + 0x1ad9, 0x1ad9, 0x1adb, 0x1adb, 0x1add, 0x1add, 0x1adf, 0x1adf, + 0x1ae1, 0x1ae1, 0x1ae3, 0x1ae3, 0x1ae5, 0x1ae5, 0x1ae7, 0x1ae7, + 0x1ae9, 0x1ae9, 0x1aeb, 0x1aeb, 0x1aed, 0x1aed, 0x1aef, 0x1aef, + 0x1af1, 0x1af1, 0x1af3, 0x1af3, 0x1af5, 0x1af5, 0x1af7, 0x1af7, + /* 0xf9a0 .. 0xf9af */ + 0x1af9, 0x1af9, 0x1a9d, 0x1a9d, 0x1afb, 0x1afb, 0x1afd, 0x1afd, + 0x1aff, 0x1aff, 0x1b01, 0x1b01, 0x1b03, 0x1b03, 0x1b05, 0x1b05, + 0x1b07, 0x1b07, 0x1b09, 0x1b09, 0x1a7d, 0x1a7d, 0x1b0b, 0x1b0b, + 0x1b0d, 0x1b0d, 0x1b0f, 0x1b0f, 0x1b11, 0x1b11, 0x1b13, 0x1b13, + /* 0xf9b0 .. 0xf9bf */ + 0x1b15, 0x1b15, 0x1b17, 0x1b17, 0x1b19, 0x1b19, 0x1b1b, 0x1b1b, + 0x1b1d, 0x1b1d, 0x1b1f, 0x1b1f, 0x1b21, 0x1b21, 0x1b23, 0x1b23, + 0x1b25, 0x1b25, 0x1b27, 0x1b27, 0x1b29, 0x1b29, 0x1b2b, 0x1b2b, + 0x1b2d, 0x1b2d, 0x1b2f, 0x1b2f, 0x1b31, 0x1b31, 0x19ed, 0x19ed, + /* 0xf9c0 .. 0xf9cf */ + 0x1b33, 0x1b33, 0x1b35, 0x1b35, 0x1b37, 0x1b37, 0x1b39, 0x1b39, + 0x1194, 0x1194, 0x1b3b, 0x1b3b, 0x1b3d, 0x1b3d, 0x1b3f, 0x1b3f, + 0x1b41, 0x1b41, 0x1b43, 0x1b43, 0x1b45, 0x1b45, 0x1b47, 0x1b47, + 0x1b49, 0x1b49, 0x1b4b, 0x1b4b, 0x1b4d, 0x1b4d, 0x1b4f, 0x1b4f, + /* 0xf9d0 .. 0xf9df */ + 0x1b51, 0x1b51, 0x14bd, 0x14bd, 0x1b53, 0x1b53, 0x1b55, 0x1b55, + 0x1b57, 0x1b57, 0x1b59, 0x1b59, 0x1b5b, 0x1b5b, 0x1b5d, 0x1b5d, + 0x1b5f, 0x1b5f, 0x1b61, 0x1b61, 0x1b63, 0x1b63, 0x1a81, 0x1a81, + 0x1b65, 0x1b65, 0x1b67, 0x1b67, 0x1b69, 0x1b69, 0x1b6b, 0x1b6b, + /* 0xf9e0 .. 0xf9ef */ + 0x1b6d, 0x1b6d, 0x1b6f, 0x1b6f, 0x1b71, 0x1b71, 0x1b73, 0x1b73, + 0x1b75, 0x1b75, 0x1b77, 0x1b77, 0x1b79, 0x1b79, 0x1b7b, 0x1b7b, + 0x1b7d, 0x1b7d, 0x1138, 0x1138, 0x1b7f, 0x1b7f, 0x1b81, 0x1b81, + 0x1b83, 0x1b83, 0x1b85, 0x1b85, 0x1b87, 0x1b87, 0x1b89, 0x1b89, + /* 0xf9f0 .. 0xf9ff */ + 0x1b8b, 0x1b8b, 0x1b8d, 0x1b8d, 0x1b8f, 0x1b8f, 0x1b91, 0x1b91, + 0x1b93, 0x1b93, 0x1b95, 0x1b95, 0x1b97, 0x1b97, 0x10d6, 0x10d6, + 0x1b99, 0x1b99, 0x1b9b, 0x1b9b, 0x1b9d, 0x1b9d, 0x1b9f, 0x1b9f, + 0x1ba1, 0x1ba1, 0x1ba3, 0x1ba3, 0x1ba5, 0x1ba5, 0x1ba7, 0x1ba7, + /* 0xfa00 .. 0xfa0f */ + 0x1ba9, 0x1ba9, 0x1bab, 0x1bab, 0x1bad, 0x1bad, 0x1baf, 0x1baf, + 0x1bb1, 0x1bb1, 0x1bb3, 0x1bb3, 0x1bb5, 0x1bb5, 0x1bb7, 0x1bb7, + 0x110c, 0x110c, 0x1bb9, 0x1bb9, 0x1112, 0x1112, 0x1bbb, 0x1bbb, + 0x1bbd, 0x1bbd, 0x1bbf, 0x1bbf, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfa10 .. 0xfa1f */ + 0x1bc1, 0x1bc1, 0x0000, 0x0000, 0x1bc3, 0x1bc3, 0x0000, 0x0000, + 0x0000, 0x0000, 0x1bc5, 0x1bc5, 0x1bc7, 0x1bc7, 0x1bc9, 0x1bc9, + 0x1bcb, 0x1bcb, 0x1bcd, 0x1bcd, 0x1bcf, 0x1bcf, 0x1bd1, 0x1bd1, + 0x1bd3, 0x1bd3, 0x1bd5, 0x1bd5, 0x10e4, 0x10e4, 0x0000, 0x0000, + /* 0xfa20 .. 0xfa2f */ + 0x1bd7, 0x1bd7, 0x0000, 0x0000, 0x1bd9, 0x1bd9, 0x0000, 0x0000, + 0x0000, 0x0000, 0x1bdb, 0x1bdb, 0x1bdd, 0x1bdd, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x1bdf, 0x1bdf, 0x1be1, 0x1be1, + 0x1be3, 0x1be3, 0x1be5, 0x1be5, 0x1be7, 0x1be7, 0x1be9, 0x1be9, + /* 0xfa30 .. 0xfa3f */ + 0x1beb, 0x1beb, 0x1bed, 0x1bed, 0x1bef, 0x1bef, 0x1bf1, 0x1bf1, + 0x1bf3, 0x1bf3, 0x1bf5, 0x1bf5, 0x1bf7, 0x1bf7, 0x1bf9, 0x1bf9, + 0x1bfb, 0x1bfb, 0x1bfd, 0x1bfd, 0x1bff, 0x1bff, 0x1c01, 0x1c01, + 0x1046, 0x1046, 0x1c03, 0x1c03, 0x1c05, 0x1c05, 0x1c07, 0x1c07, + /* 0xfa40 .. 0xfa4f */ + 0x1c09, 0x1c09, 0x1c0b, 0x1c0b, 0x1c0d, 0x1c0d, 0x1c0f, 0x1c0f, + 0x1c11, 0x1c11, 0x1c13, 0x1c13, 0x1c15, 0x1c15, 0x1c17, 0x1c17, + 0x1c19, 0x1c19, 0x1c1b, 0x1c1b, 0x1c1d, 0x1c1d, 0x1c1f, 0x1c1f, + 0x14c7, 0x14c7, 0x1c21, 0x1c21, 0x1c23, 0x1c23, 0x1c25, 0x1c25, + /* 0xfa50 .. 0xfa5f */ + 0x1c27, 0x1c27, 0x14cf, 0x14cf, 0x1c29, 0x1c29, 0x1c2b, 0x1c2b, + 0x1c2d, 0x1c2d, 0x1c2f, 0x1c2f, 0x1c31, 0x1c31, 0x1ae5, 0x1ae5, + 0x1c33, 0x1c33, 0x1c35, 0x1c35, 0x1c37, 0x1c37, 0x1c39, 0x1c39, + 0x1c3b, 0x1c3b, 0x1c3d, 0x1c3d, 0x1c3d, 0x1c3d, 0x1c3f, 0x1c3f, + /* 0xfa60 .. 0xfa6f */ + 0x1c41, 0x1c41, 0x1c43, 0x1c43, 0x1c45, 0x1c45, 0x1c47, 0x1c47, + 0x1c49, 0x1c49, 0x1c4b, 0x1c4b, 0x1c4d, 0x1c4d, 0x1bdb, 0x1bdb, + 0x1c4f, 0x1c4f, 0x1c51, 0x1c51, 0x1c53, 0x1c53, 0x1c55, 0x1c55, + 0x1c57, 0x1c57, 0x1c5a, 0x1c5a, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfa70 .. 0xfa7f */ + 0x1c5c, 0x1c5c, 0x1c5e, 0x1c5e, 0x1c60, 0x1c60, 0x1c62, 0x1c62, + 0x1c64, 0x1c64, 0x1c66, 0x1c66, 0x1c68, 0x1c68, 0x1c6a, 0x1c6a, + 0x1bf7, 0x1bf7, 0x1c6c, 0x1c6c, 0x1c6e, 0x1c6e, 0x1c70, 0x1c70, + 0x1bc1, 0x1bc1, 0x1c72, 0x1c72, 0x1c74, 0x1c74, 0x1c76, 0x1c76, + /* 0xfa80 .. 0xfa8f */ + 0x1c78, 0x1c78, 0x1c7a, 0x1c7a, 0x1c7c, 0x1c7c, 0x1c7e, 0x1c7e, + 0x1c80, 0x1c80, 0x1c82, 0x1c82, 0x1c84, 0x1c84, 0x1c86, 0x1c86, + 0x1c88, 0x1c88, 0x1c07, 0x1c07, 0x1c8a, 0x1c8a, 0x1c09, 0x1c09, + 0x1c8c, 0x1c8c, 0x1c8e, 0x1c8e, 0x1c90, 0x1c90, 0x1c92, 0x1c92, + /* 0xfa90 .. 0xfa9f */ + 0x1c94, 0x1c94, 0x1bc3, 0x1bc3, 0x1a17, 0x1a17, 0x1c96, 0x1c96, + 0x1c98, 0x1c98, 0x1088, 0x1088, 0x1a9f, 0x1a9f, 0x1b45, 0x1b45, + 0x1c9a, 0x1c9a, 0x1c9c, 0x1c9c, 0x1c17, 0x1c17, 0x1c9e, 0x1c9e, + 0x1c19, 0x1c19, 0x1ca0, 0x1ca0, 0x1ca2, 0x1ca2, 0x1ca4, 0x1ca4, + /* 0xfaa0 .. 0xfaaf */ + 0x1bc7, 0x1bc7, 0x1ca6, 0x1ca6, 0x1ca8, 0x1ca8, 0x1caa, 0x1caa, + 0x1cac, 0x1cac, 0x1cae, 0x1cae, 0x1bc9, 0x1bc9, 0x1cb0, 0x1cb0, + 0x1cb2, 0x1cb2, 0x1cb4, 0x1cb4, 0x1cb6, 0x1cb6, 0x1cb8, 0x1cb8, + 0x1cba, 0x1cba, 0x1c31, 0x1c31, 0x1cbc, 0x1cbc, 0x1cbe, 0x1cbe, + /* 0xfab0 .. 0xfabf */ + 0x1ae5, 0x1ae5, 0x1cc0, 0x1cc0, 0x1c39, 0x1c39, 0x1cc2, 0x1cc2, + 0x1cc4, 0x1cc4, 0x1cc6, 0x1cc6, 0x1cc8, 0x1cc8, 0x1cca, 0x1cca, + 0x1c43, 0x1c43, 0x1ccc, 0x1ccc, 0x1bd9, 0x1bd9, 0x1cce, 0x1cce, + 0x1c45, 0x1c45, 0x1a79, 0x1a79, 0x1cd0, 0x1cd0, 0x1c47, 0x1c47, + /* 0xfac0 .. 0xfacf */ + 0x1cd2, 0x1cd2, 0x1c4b, 0x1c4b, 0x1cd4, 0x1cd4, 0x1cd6, 0x1cd6, + 0x1cd8, 0x1cd8, 0x1cda, 0x1cda, 0x1cdc, 0x1cdc, 0x1c4f, 0x1c4f, + 0x1bd3, 0x1bd3, 0x1cde, 0x1cde, 0x1c51, 0x1c51, 0x1ce0, 0x1ce0, + 0x1c53, 0x1c53, 0x1ce2, 0x1ce2, 0x1196, 0x1196, 0x1ce4, 0x1ce4, + /* 0xfad0 .. 0xfadf */ + 0x1ce7, 0x1ce7, 0x1cea, 0x1cea, 0x1ced, 0x1ced, 0x1cef, 0x1cef, + 0x1cf1, 0x1cf1, 0x1cf3, 0x1cf3, 0x1cf6, 0x1cf6, 0x1cf9, 0x1cf9, + 0x1cfc, 0x1cfc, 0x1cfe, 0x1cfe, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfb00 .. 0xfb0f */ + 0x0000, 0x1d00, 0x0000, 0x1d03, 0x0000, 0x1d06, 0x0000, 0x1d09, + 0x0000, 0x1d0d, 0x0000, 0x1d11, 0x0000, 0x1d11, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0xfb10 .. 0xfb1f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1d14, + 0x0000, 0x1d17, 0x0000, 0x1d1a, 0x0000, 0x1d1d, 0x0000, 0x1d20, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x05d9, 0x05b4, 0x0000, 0x0000, 0x05f2, 0x05b7, + 0x0000, 0x0000, 0x1d23, 0x1d23, 0x0000, 0x0000, 0x1d26, 0x1d26, /* 0xfb20 .. 0xfb2f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x05e9, 0x05c1, 0x05e9, 0x05c2, - 0xfb49, 0x05c1, 0xfb49, 0x05c2, 0x05d0, 0x05b7, 0x05d0, 0x05b8, + 0x0000, 0x1d29, 0x0000, 0x0d74, 0x0000, 0x0d7a, 0x0000, 0x1d2b, + 0x0000, 0x1d2d, 0x0000, 0x1d2f, 0x0000, 0x1d31, 0x0000, 0x1d33, + 0x0000, 0x1d35, 0x0000, 0x0d34, 0x1d37, 0x1d37, 0x1d3a, 0x1d3a, + 0x1d3d, 0x1d3d, 0x1d41, 0x1d41, 0x1d45, 0x1d45, 0x1d48, 0x1d48, /* 0xfb30 .. 0xfb3f */ - 0x05d0, 0x05bc, 0x05d1, 0x05bc, 0x05d2, 0x05bc, 0x05d3, 0x05bc, - 0x05d4, 0x05bc, 0x05d5, 0x05bc, 0x05d6, 0x05bc, 0x0000, 0x0000, - 0x05d8, 0x05bc, 0x05d9, 0x05bc, 0x05da, 0x05bc, 0x05db, 0x05bc, - 0x05dc, 0x05bc, 0x0000, 0x0000, 0x05de, 0x05bc, 0x0000, 0x0000, + 0x1d4b, 0x1d4b, 0x1d4e, 0x1d4e, 0x1d51, 0x1d51, 0x1d54, 0x1d54, + 0x1d57, 0x1d57, 0x1d5a, 0x1d5a, 0x1d5d, 0x1d5d, 0x0000, 0x0000, + 0x1d60, 0x1d60, 0x1d63, 0x1d63, 0x1d66, 0x1d66, 0x1d69, 0x1d69, + 0x1d6c, 0x1d6c, 0x0000, 0x0000, 0x1d6f, 0x1d6f, 0x0000, 0x0000, /* 0xfb40 .. 0xfb4f */ - 0x05e0, 0x05bc, 0x05e1, 0x05bc, 0x0000, 0x0000, 0x05e3, 0x05bc, - 0x05e4, 0x05bc, 0x0000, 0x0000, 0x05e6, 0x05bc, 0x05e7, 0x05bc, - 0x05e8, 0x05bc, 0x05e9, 0x05bc, 0x05ea, 0x05bc, 0x05d5, 0x05b9, - 0x05d1, 0x05bf, 0x05db, 0x05bf, 0x05e4, 0x05bf, 0x0000, 0x0000 + 0x1d72, 0x1d72, 0x1d75, 0x1d75, 0x0000, 0x0000, 0x1d78, 0x1d78, + 0x1d7b, 0x1d7b, 0x0000, 0x0000, 0x1d7e, 0x1d7e, 0x1d81, 0x1d81, + 0x1d84, 0x1d84, 0x1d87, 0x1d87, 0x1d8a, 0x1d8a, 0x1d8d, 0x1d8d, + 0x1d90, 0x1d90, 0x1d93, 0x1d93, 0x1d96, 0x1d96, 0x0000, 0x1d99, + /* 0xfb50 .. 0xfb5f */ + 0x0000, 0x1d9c, 0x0000, 0x1d9c, 0x0000, 0x1d9e, 0x0000, 0x1d9e, + 0x0000, 0x1d9e, 0x0000, 0x1d9e, 0x0000, 0x1da0, 0x0000, 0x1da0, + 0x0000, 0x1da0, 0x0000, 0x1da0, 0x0000, 0x1da2, 0x0000, 0x1da2, + 0x0000, 0x1da2, 0x0000, 0x1da2, 0x0000, 0x1da4, 0x0000, 0x1da4, + /* 0xfb60 .. 0xfb6f */ + 0x0000, 0x1da4, 0x0000, 0x1da4, 0x0000, 0x1da6, 0x0000, 0x1da6, + 0x0000, 0x1da6, 0x0000, 0x1da6, 0x0000, 0x1da8, 0x0000, 0x1da8, + 0x0000, 0x1da8, 0x0000, 0x1da8, 0x0000, 0x1daa, 0x0000, 0x1daa, + 0x0000, 0x1daa, 0x0000, 0x1daa, 0x0000, 0x1dac, 0x0000, 0x1dac, + /* 0xfb70 .. 0xfb7f */ + 0x0000, 0x1dac, 0x0000, 0x1dac, 0x0000, 0x1dae, 0x0000, 0x1dae, + 0x0000, 0x1dae, 0x0000, 0x1dae, 0x0000, 0x1db0, 0x0000, 0x1db0, + 0x0000, 0x1db0, 0x0000, 0x1db0, 0x0000, 0x1db2, 0x0000, 0x1db2, + 0x0000, 0x1db2, 0x0000, 0x1db2, 0x0000, 0x1db4, 0x0000, 0x1db4, + /* 0xfb80 .. 0xfb8f */ + 0x0000, 0x1db4, 0x0000, 0x1db4, 0x0000, 0x1db6, 0x0000, 0x1db6, + 0x0000, 0x1db8, 0x0000, 0x1db8, 0x0000, 0x1dba, 0x0000, 0x1dba, + 0x0000, 0x1dbc, 0x0000, 0x1dbc, 0x0000, 0x1dbe, 0x0000, 0x1dbe, + 0x0000, 0x1dc0, 0x0000, 0x1dc0, 0x0000, 0x1dc2, 0x0000, 0x1dc2, + /* 0xfb90 .. 0xfb9f */ + 0x0000, 0x1dc2, 0x0000, 0x1dc2, 0x0000, 0x1dc4, 0x0000, 0x1dc4, + 0x0000, 0x1dc4, 0x0000, 0x1dc4, 0x0000, 0x1dc6, 0x0000, 0x1dc6, + 0x0000, 0x1dc6, 0x0000, 0x1dc6, 0x0000, 0x1dc8, 0x0000, 0x1dc8, + 0x0000, 0x1dc8, 0x0000, 0x1dc8, 0x0000, 0x1dca, 0x0000, 0x1dca, + /* 0xfba0 .. 0xfbaf */ + 0x0000, 0x1dcc, 0x0000, 0x1dcc, 0x0000, 0x1dcc, 0x0000, 0x1dcc, + 0x0000, 0x04c2, 0x0000, 0x04c2, 0x0000, 0x1dce, 0x0000, 0x1dce, + 0x0000, 0x1dce, 0x0000, 0x1dce, 0x0000, 0x1dd0, 0x0000, 0x1dd0, + 0x0000, 0x1dd0, 0x0000, 0x1dd0, 0x0000, 0x1dd2, 0x0000, 0x1dd2, + /* 0xfbb0 .. 0xfbbf */ + 0x0000, 0x04c8, 0x0000, 0x04c8, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfbd0 .. 0xfbdf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1dd4, + 0x0000, 0x1dd4, 0x0000, 0x1dd4, 0x0000, 0x1dd4, 0x0000, 0x1dd6, + 0x0000, 0x1dd6, 0x0000, 0x1dd8, 0x0000, 0x1dd8, 0x0000, 0x1dda, + 0x0000, 0x1dda, 0x0000, 0x04bc, 0x0000, 0x1ddc, 0x0000, 0x1ddc, + /* 0xfbe0 .. 0xfbef */ + 0x0000, 0x1dde, 0x0000, 0x1dde, 0x0000, 0x1de0, 0x0000, 0x1de0, + 0x0000, 0x1de2, 0x0000, 0x1de2, 0x0000, 0x1de2, 0x0000, 0x1de2, + 0x0000, 0x1de4, 0x0000, 0x1de4, 0x0000, 0x1de6, 0x0000, 0x1de6, + 0x0000, 0x1dea, 0x0000, 0x1dea, 0x0000, 0x1dee, 0x0000, 0x1dee, + /* 0xfbf0 .. 0xfbff */ + 0x0000, 0x1df2, 0x0000, 0x1df2, 0x0000, 0x1df6, 0x0000, 0x1df6, + 0x0000, 0x1dfa, 0x0000, 0x1dfa, 0x0000, 0x1dfe, 0x0000, 0x1dfe, + 0x0000, 0x1dfe, 0x0000, 0x1e02, 0x0000, 0x1e02, 0x0000, 0x1e02, + 0x0000, 0x1e06, 0x0000, 0x1e06, 0x0000, 0x1e06, 0x0000, 0x1e06, + /* 0xfc00 .. 0xfc0f */ + 0x0000, 0x1e08, 0x0000, 0x1e0c, 0x0000, 0x1e10, 0x0000, 0x1e02, + 0x0000, 0x1e14, 0x0000, 0x1e18, 0x0000, 0x1e1b, 0x0000, 0x1e1e, + 0x0000, 0x1e21, 0x0000, 0x1e24, 0x0000, 0x1e27, 0x0000, 0x1e2a, + 0x0000, 0x1e2d, 0x0000, 0x1e30, 0x0000, 0x1e33, 0x0000, 0x1e36, + /* 0xfc10 .. 0xfc1f */ + 0x0000, 0x1e39, 0x0000, 0x1e3c, 0x0000, 0x1e3f, 0x0000, 0x1e42, + 0x0000, 0x1e45, 0x0000, 0x1e48, 0x0000, 0x1e4b, 0x0000, 0x1e4e, + 0x0000, 0x1e51, 0x0000, 0x1e54, 0x0000, 0x1e57, 0x0000, 0x1e5a, + 0x0000, 0x1e5d, 0x0000, 0x1e60, 0x0000, 0x1e63, 0x0000, 0x1e66, + /* 0xfc20 .. 0xfc2f */ + 0x0000, 0x1e69, 0x0000, 0x1e6c, 0x0000, 0x1e6f, 0x0000, 0x1e72, + 0x0000, 0x1e75, 0x0000, 0x1e78, 0x0000, 0x1e7b, 0x0000, 0x1e7e, + 0x0000, 0x1e81, 0x0000, 0x1e84, 0x0000, 0x1e87, 0x0000, 0x1e8a, + 0x0000, 0x1e8d, 0x0000, 0x1e90, 0x0000, 0x1e93, 0x0000, 0x1e96, + /* 0xfc30 .. 0xfc3f */ + 0x0000, 0x1e99, 0x0000, 0x1e9c, 0x0000, 0x1e9f, 0x0000, 0x1ea2, + 0x0000, 0x1ea5, 0x0000, 0x1ea8, 0x0000, 0x1eab, 0x0000, 0x1eae, + 0x0000, 0x1eb1, 0x0000, 0x1eb4, 0x0000, 0x1eb7, 0x0000, 0x1eba, + 0x0000, 0x1ebd, 0x0000, 0x1ec0, 0x0000, 0x1ec3, 0x0000, 0x1ec6, + /* 0xfc40 .. 0xfc4f */ + 0x0000, 0x1ec9, 0x0000, 0x1ecc, 0x0000, 0x1ecf, 0x0000, 0x1ed2, + 0x0000, 0x1ed5, 0x0000, 0x1ed8, 0x0000, 0x1edb, 0x0000, 0x1ede, + 0x0000, 0x1ee1, 0x0000, 0x1ee4, 0x0000, 0x1ee7, 0x0000, 0x1eea, + 0x0000, 0x1eed, 0x0000, 0x1ef0, 0x0000, 0x1ef3, 0x0000, 0x1ef6, + /* 0xfc50 .. 0xfc5f */ + 0x0000, 0x1ef9, 0x0000, 0x1efc, 0x0000, 0x1eff, 0x0000, 0x1f02, + 0x0000, 0x1f05, 0x0000, 0x1f08, 0x0000, 0x1f0b, 0x0000, 0x1f0e, + 0x0000, 0x1f11, 0x0000, 0x1f14, 0x0000, 0x1f17, 0x0000, 0x1f1a, + 0x0000, 0x1f1d, 0x0000, 0x1f20, 0x0000, 0x1f23, 0x0000, 0x1f27, + /* 0xfc60 .. 0xfc6f */ + 0x0000, 0x1f2b, 0x0000, 0x1f2f, 0x0000, 0x1f33, 0x0000, 0x1f37, + 0x0000, 0x1f3b, 0x0000, 0x1f3f, 0x0000, 0x1e10, 0x0000, 0x1f43, + 0x0000, 0x1e02, 0x0000, 0x1e14, 0x0000, 0x1f47, 0x0000, 0x1f4a, + 0x0000, 0x1e21, 0x0000, 0x1f4d, 0x0000, 0x1e24, 0x0000, 0x1e27, + /* 0xfc70 .. 0xfc7f */ + 0x0000, 0x1f50, 0x0000, 0x1f53, 0x0000, 0x1e33, 0x0000, 0x1f56, + 0x0000, 0x1e36, 0x0000, 0x1e39, 0x0000, 0x1f59, 0x0000, 0x1f5c, + 0x0000, 0x1e3f, 0x0000, 0x1f5f, 0x0000, 0x1e42, 0x0000, 0x1e45, + 0x0000, 0x1e9c, 0x0000, 0x1e9f, 0x0000, 0x1ea8, 0x0000, 0x1eab, + /* 0xfc80 .. 0xfc8f */ + 0x0000, 0x1eae, 0x0000, 0x1eba, 0x0000, 0x1ebd, 0x0000, 0x1ec0, + 0x0000, 0x1ec3, 0x0000, 0x1ecf, 0x0000, 0x1ed2, 0x0000, 0x1ed5, + 0x0000, 0x1f62, 0x0000, 0x1ee1, 0x0000, 0x1f65, 0x0000, 0x1f68, + 0x0000, 0x1ef3, 0x0000, 0x1f6b, 0x0000, 0x1ef6, 0x0000, 0x1ef9, + /* 0xfc90 .. 0xfc9f */ + 0x0000, 0x1f20, 0x0000, 0x1f6e, 0x0000, 0x1f71, 0x0000, 0x1f11, + 0x0000, 0x1f74, 0x0000, 0x1f14, 0x0000, 0x1f17, 0x0000, 0x1e08, + 0x0000, 0x1e0c, 0x0000, 0x1f77, 0x0000, 0x1e10, 0x0000, 0x1f7b, + 0x0000, 0x1e18, 0x0000, 0x1e1b, 0x0000, 0x1e1e, 0x0000, 0x1e21, + /* 0xfca0 .. 0xfcaf */ + 0x0000, 0x1f7f, 0x0000, 0x1e2a, 0x0000, 0x1e2d, 0x0000, 0x1e30, + 0x0000, 0x1e33, 0x0000, 0x1f82, 0x0000, 0x1e3f, 0x0000, 0x1e48, + 0x0000, 0x1e4b, 0x0000, 0x1e4e, 0x0000, 0x1e51, 0x0000, 0x1e54, + 0x0000, 0x1e5a, 0x0000, 0x1e5d, 0x0000, 0x1e60, 0x0000, 0x1e63, + /* 0xfcb0 .. 0xfcbf */ + 0x0000, 0x1e66, 0x0000, 0x1e69, 0x0000, 0x1f85, 0x0000, 0x1e6c, + 0x0000, 0x1e6f, 0x0000, 0x1e72, 0x0000, 0x1e75, 0x0000, 0x1e78, + 0x0000, 0x1e7b, 0x0000, 0x1e81, 0x0000, 0x1e84, 0x0000, 0x1e87, + 0x0000, 0x1e8a, 0x0000, 0x1e8d, 0x0000, 0x1e90, 0x0000, 0x1e93, + /* 0xfcc0 .. 0xfccf */ + 0x0000, 0x1e96, 0x0000, 0x1e99, 0x0000, 0x1ea2, 0x0000, 0x1ea5, + 0x0000, 0x1eb1, 0x0000, 0x1eb4, 0x0000, 0x1eb7, 0x0000, 0x1eba, + 0x0000, 0x1ebd, 0x0000, 0x1ec6, 0x0000, 0x1ec9, 0x0000, 0x1ecc, + 0x0000, 0x1ecf, 0x0000, 0x1f88, 0x0000, 0x1ed8, 0x0000, 0x1edb, + /* 0xfcd0 .. 0xfcdf */ + 0x0000, 0x1ede, 0x0000, 0x1ee1, 0x0000, 0x1eea, 0x0000, 0x1eed, + 0x0000, 0x1ef0, 0x0000, 0x1ef3, 0x0000, 0x1f8b, 0x0000, 0x1efc, + 0x0000, 0x1eff, 0x0000, 0x1f8e, 0x0000, 0x1f08, 0x0000, 0x1f0b, + 0x0000, 0x1f0e, 0x0000, 0x1f11, 0x0000, 0x1f91, 0x0000, 0x1e10, + /* 0xfce0 .. 0xfcef */ + 0x0000, 0x1f7b, 0x0000, 0x1e21, 0x0000, 0x1f7f, 0x0000, 0x1e33, + 0x0000, 0x1f82, 0x0000, 0x1e3f, 0x0000, 0x1f94, 0x0000, 0x1e66, + 0x0000, 0x1f97, 0x0000, 0x1f9a, 0x0000, 0x1f9d, 0x0000, 0x1eba, + 0x0000, 0x1ebd, 0x0000, 0x1ecf, 0x0000, 0x1ef3, 0x0000, 0x1f8b, + /* 0xfcf0 .. 0xfcff */ + 0x0000, 0x1f11, 0x0000, 0x1f91, 0x0000, 0x1fa0, 0x0000, 0x1fa4, + 0x0000, 0x1fa8, 0x0000, 0x1fac, 0x0000, 0x1faf, 0x0000, 0x1fb2, + 0x0000, 0x1fb5, 0x0000, 0x1fb8, 0x0000, 0x1fbb, 0x0000, 0x1fbe, + 0x0000, 0x1fc1, 0x0000, 0x1fc4, 0x0000, 0x1fc7, 0x0000, 0x1fca, + /* 0xfd00 .. 0xfd0f */ + 0x0000, 0x1fcd, 0x0000, 0x1fd0, 0x0000, 0x1fd3, 0x0000, 0x1fd6, + 0x0000, 0x1fd9, 0x0000, 0x1fdc, 0x0000, 0x1fdf, 0x0000, 0x1fe2, + 0x0000, 0x1fe5, 0x0000, 0x1fe8, 0x0000, 0x1feb, 0x0000, 0x1fee, + 0x0000, 0x1f9a, 0x0000, 0x1ff1, 0x0000, 0x1ff4, 0x0000, 0x1ff7, + /* 0xfd10 .. 0xfd1f */ + 0x0000, 0x1ffa, 0x0000, 0x1fac, 0x0000, 0x1faf, 0x0000, 0x1fb2, + 0x0000, 0x1fb5, 0x0000, 0x1fb8, 0x0000, 0x1fbb, 0x0000, 0x1fbe, + 0x0000, 0x1fc1, 0x0000, 0x1fc4, 0x0000, 0x1fc7, 0x0000, 0x1fca, + 0x0000, 0x1fcd, 0x0000, 0x1fd0, 0x0000, 0x1fd3, 0x0000, 0x1fd6, + /* 0xfd20 .. 0xfd2f */ + 0x0000, 0x1fd9, 0x0000, 0x1fdc, 0x0000, 0x1fdf, 0x0000, 0x1fe2, + 0x0000, 0x1fe5, 0x0000, 0x1fe8, 0x0000, 0x1feb, 0x0000, 0x1fee, + 0x0000, 0x1f9a, 0x0000, 0x1ff1, 0x0000, 0x1ff4, 0x0000, 0x1ff7, + 0x0000, 0x1ffa, 0x0000, 0x1fe8, 0x0000, 0x1feb, 0x0000, 0x1fee, + /* 0xfd30 .. 0xfd3f */ + 0x0000, 0x1f9a, 0x0000, 0x1f97, 0x0000, 0x1f9d, 0x0000, 0x1e7e, + 0x0000, 0x1e5d, 0x0000, 0x1e60, 0x0000, 0x1e63, 0x0000, 0x1fe8, + 0x0000, 0x1feb, 0x0000, 0x1fee, 0x0000, 0x1e7e, 0x0000, 0x1e81, + 0x0000, 0x1ffd, 0x0000, 0x1ffd, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfd50 .. 0xfd5f */ + 0x0000, 0x2000, 0x0000, 0x2004, 0x0000, 0x2004, 0x0000, 0x2008, + 0x0000, 0x200c, 0x0000, 0x2010, 0x0000, 0x2014, 0x0000, 0x2018, + 0x0000, 0x201c, 0x0000, 0x201c, 0x0000, 0x2020, 0x0000, 0x2024, + 0x0000, 0x2028, 0x0000, 0x202c, 0x0000, 0x2030, 0x0000, 0x2034, + /* 0xfd60 .. 0xfd6f */ + 0x0000, 0x2034, 0x0000, 0x2038, 0x0000, 0x203c, 0x0000, 0x203c, + 0x0000, 0x2040, 0x0000, 0x2040, 0x0000, 0x2044, 0x0000, 0x2048, + 0x0000, 0x2048, 0x0000, 0x204c, 0x0000, 0x2050, 0x0000, 0x2050, + 0x0000, 0x2054, 0x0000, 0x2054, 0x0000, 0x2058, 0x0000, 0x205c, + /* 0xfd70 .. 0xfd7f */ + 0x0000, 0x205c, 0x0000, 0x2060, 0x0000, 0x2060, 0x0000, 0x2064, + 0x0000, 0x2068, 0x0000, 0x206c, 0x0000, 0x2070, 0x0000, 0x2070, + 0x0000, 0x2074, 0x0000, 0x2078, 0x0000, 0x207c, 0x0000, 0x2080, + 0x0000, 0x2084, 0x0000, 0x2084, 0x0000, 0x2088, 0x0000, 0x208c, + /* 0xfd80 .. 0xfd8f */ + 0x0000, 0x2090, 0x0000, 0x2094, 0x0000, 0x2098, 0x0000, 0x209c, + 0x0000, 0x209c, 0x0000, 0x20a0, 0x0000, 0x20a0, 0x0000, 0x20a4, + 0x0000, 0x20a4, 0x0000, 0x20a8, 0x0000, 0x20ac, 0x0000, 0x20b0, + 0x0000, 0x20b4, 0x0000, 0x20b8, 0x0000, 0x20bc, 0x0000, 0x20c0, + /* 0xfd90 .. 0xfd9f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x20c4, 0x0000, 0x20c8, + 0x0000, 0x20cc, 0x0000, 0x20d0, 0x0000, 0x20d4, 0x0000, 0x20d8, + 0x0000, 0x20d8, 0x0000, 0x20dc, 0x0000, 0x20e0, 0x0000, 0x20e4, + 0x0000, 0x20e8, 0x0000, 0x20e8, 0x0000, 0x20ec, 0x0000, 0x20f0, + /* 0xfda0 .. 0xfdaf */ + 0x0000, 0x20f4, 0x0000, 0x20f8, 0x0000, 0x20fc, 0x0000, 0x2100, + 0x0000, 0x2104, 0x0000, 0x2108, 0x0000, 0x210c, 0x0000, 0x2110, + 0x0000, 0x2114, 0x0000, 0x2118, 0x0000, 0x211c, 0x0000, 0x2120, + 0x0000, 0x2124, 0x0000, 0x2128, 0x0000, 0x212c, 0x0000, 0x2130, + /* 0xfdb0 .. 0xfdbf */ + 0x0000, 0x2134, 0x0000, 0x2138, 0x0000, 0x213c, 0x0000, 0x2140, + 0x0000, 0x2088, 0x0000, 0x2090, 0x0000, 0x2144, 0x0000, 0x2148, + 0x0000, 0x214c, 0x0000, 0x2150, 0x0000, 0x2154, 0x0000, 0x2158, + 0x0000, 0x2154, 0x0000, 0x214c, 0x0000, 0x215c, 0x0000, 0x2160, + /* 0xfdc0 .. 0xfdcf */ + 0x0000, 0x2164, 0x0000, 0x2168, 0x0000, 0x216c, 0x0000, 0x2158, + 0x0000, 0x206c, 0x0000, 0x2044, 0x0000, 0x2170, 0x0000, 0x2174, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfdf0 .. 0xfdff */ + 0x0000, 0x2178, 0x0000, 0x217c, 0x0000, 0x2180, 0x0000, 0x2185, + 0x0000, 0x218a, 0x0000, 0x218f, 0x0000, 0x2194, 0x0000, 0x2199, + 0x0000, 0x219e, 0x0000, 0x21a3, 0x0000, 0x21a7, 0x0000, 0x21ba, + 0x0000, 0x21c3, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfe10 .. 0xfe1f */ + 0x0000, 0x21c8, 0x0000, 0x21ca, 0x0000, 0x21cc, 0x0000, 0x21ce, + 0x0000, 0x03a3, 0x0000, 0x21d0, 0x0000, 0x21d2, 0x0000, 0x21d4, + 0x0000, 0x21d6, 0x0000, 0x0d00, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfe30 .. 0xfe3f */ + 0x0000, 0x0cfd, 0x0000, 0x21d8, 0x0000, 0x21da, 0x0000, 0x21dc, + 0x0000, 0x21dc, 0x0000, 0x0d3a, 0x0000, 0x0d3c, 0x0000, 0x21de, + 0x0000, 0x21e0, 0x0000, 0x21e2, 0x0000, 0x21e4, 0x0000, 0x21e6, + 0x0000, 0x21e8, 0x0000, 0x21ea, 0x0000, 0x21ec, 0x0000, 0x0ea0, + /* 0xfe40 .. 0xfe4f */ + 0x0000, 0x0ea2, 0x0000, 0x21ee, 0x0000, 0x21f0, 0x0000, 0x21f2, + 0x0000, 0x21f4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x21f6, + 0x0000, 0x21f8, 0x0000, 0x0d15, 0x0000, 0x0d15, 0x0000, 0x0d15, + 0x0000, 0x0d15, 0x0000, 0x21dc, 0x0000, 0x21dc, 0x0000, 0x21dc, + /* 0xfe50 .. 0xfe5f */ + 0x0000, 0x21c8, 0x0000, 0x21ca, 0x0000, 0x0cfb, 0x0000, 0x0000, + 0x0000, 0x03a3, 0x0000, 0x21ce, 0x0000, 0x21d2, 0x0000, 0x21d0, + 0x0000, 0x21d8, 0x0000, 0x0d3a, 0x0000, 0x0d3c, 0x0000, 0x21de, + 0x0000, 0x21e0, 0x0000, 0x21e2, 0x0000, 0x21e4, 0x0000, 0x21fa, + /* 0xfe60 .. 0xfe6f */ + 0x0000, 0x21fc, 0x0000, 0x21fe, 0x0000, 0x0d34, 0x0000, 0x2200, + 0x0000, 0x2202, 0x0000, 0x2204, 0x0000, 0x0d38, 0x0000, 0x0000, + 0x0000, 0x2206, 0x0000, 0x2208, 0x0000, 0x220a, 0x0000, 0x220c, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfe70 .. 0xfe7f */ + 0x0000, 0x220e, 0x0000, 0x2211, 0x0000, 0x2214, 0x0000, 0x0000, + 0x0000, 0x2217, 0x0000, 0x0000, 0x0000, 0x221a, 0x0000, 0x221d, + 0x0000, 0x2220, 0x0000, 0x2223, 0x0000, 0x2226, 0x0000, 0x2229, + 0x0000, 0x222c, 0x0000, 0x222f, 0x0000, 0x2232, 0x0000, 0x2235, + /* 0xfe80 .. 0xfe8f */ + 0x0000, 0x2238, 0x0000, 0x04a7, 0x0000, 0x04a7, 0x0000, 0x04aa, + 0x0000, 0x04aa, 0x0000, 0x04ad, 0x0000, 0x04ad, 0x0000, 0x04b0, + 0x0000, 0x04b0, 0x0000, 0x04b3, 0x0000, 0x04b3, 0x0000, 0x04b3, + 0x0000, 0x04b3, 0x0000, 0x223a, 0x0000, 0x223a, 0x0000, 0x223c, + /* 0xfe90 .. 0xfe9f */ + 0x0000, 0x223c, 0x0000, 0x223c, 0x0000, 0x223c, 0x0000, 0x223e, + 0x0000, 0x223e, 0x0000, 0x2240, 0x0000, 0x2240, 0x0000, 0x2240, + 0x0000, 0x2240, 0x0000, 0x2242, 0x0000, 0x2242, 0x0000, 0x2242, + 0x0000, 0x2242, 0x0000, 0x2244, 0x0000, 0x2244, 0x0000, 0x2244, + /* 0xfea0 .. 0xfeaf */ + 0x0000, 0x2244, 0x0000, 0x2246, 0x0000, 0x2246, 0x0000, 0x2246, + 0x0000, 0x2246, 0x0000, 0x2248, 0x0000, 0x2248, 0x0000, 0x2248, + 0x0000, 0x2248, 0x0000, 0x224a, 0x0000, 0x224a, 0x0000, 0x224c, + 0x0000, 0x224c, 0x0000, 0x224e, 0x0000, 0x224e, 0x0000, 0x2250, + /* 0xfeb0 .. 0xfebf */ + 0x0000, 0x2250, 0x0000, 0x2252, 0x0000, 0x2252, 0x0000, 0x2252, + 0x0000, 0x2252, 0x0000, 0x2254, 0x0000, 0x2254, 0x0000, 0x2254, + 0x0000, 0x2254, 0x0000, 0x2256, 0x0000, 0x2256, 0x0000, 0x2256, + 0x0000, 0x2256, 0x0000, 0x2258, 0x0000, 0x2258, 0x0000, 0x2258, + /* 0xfec0 .. 0xfecf */ + 0x0000, 0x2258, 0x0000, 0x225a, 0x0000, 0x225a, 0x0000, 0x225a, + 0x0000, 0x225a, 0x0000, 0x225c, 0x0000, 0x225c, 0x0000, 0x225c, + 0x0000, 0x225c, 0x0000, 0x225e, 0x0000, 0x225e, 0x0000, 0x225e, + 0x0000, 0x225e, 0x0000, 0x2260, 0x0000, 0x2260, 0x0000, 0x2260, + /* 0xfed0 .. 0xfedf */ + 0x0000, 0x2260, 0x0000, 0x2262, 0x0000, 0x2262, 0x0000, 0x2262, + 0x0000, 0x2262, 0x0000, 0x2264, 0x0000, 0x2264, 0x0000, 0x2264, + 0x0000, 0x2264, 0x0000, 0x2266, 0x0000, 0x2266, 0x0000, 0x2266, + 0x0000, 0x2266, 0x0000, 0x2268, 0x0000, 0x2268, 0x0000, 0x2268, + /* 0xfee0 .. 0xfeef */ + 0x0000, 0x2268, 0x0000, 0x226a, 0x0000, 0x226a, 0x0000, 0x226a, + 0x0000, 0x226a, 0x0000, 0x226c, 0x0000, 0x226c, 0x0000, 0x226c, + 0x0000, 0x226c, 0x0000, 0x226e, 0x0000, 0x226e, 0x0000, 0x226e, + 0x0000, 0x226e, 0x0000, 0x2270, 0x0000, 0x2270, 0x0000, 0x1de4, + /* 0xfef0 .. 0xfeff */ + 0x0000, 0x1de4, 0x0000, 0x2272, 0x0000, 0x2272, 0x0000, 0x2272, + 0x0000, 0x2272, 0x0000, 0x2274, 0x0000, 0x2274, 0x0000, 0x2278, + 0x0000, 0x2278, 0x0000, 0x227c, 0x0000, 0x227c, 0x0000, 0x2280, + 0x0000, 0x2280, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xff00 .. 0xff0f */ + 0x0000, 0x0000, 0x0000, 0x21d0, 0x0000, 0x2283, 0x0000, 0x21fa, + 0x0000, 0x2208, 0x0000, 0x220a, 0x0000, 0x21fc, 0x0000, 0x2285, + 0x0000, 0x0d3a, 0x0000, 0x0d3c, 0x0000, 0x21fe, 0x0000, 0x0d34, + 0x0000, 0x21c8, 0x0000, 0x2200, 0x0000, 0x0cfb, 0x0000, 0x2287, + /* 0xff10 .. 0xff1f */ + 0x0000, 0x0d26, 0x0000, 0x0017, 0x0000, 0x000b, 0x0000, 0x000d, + 0x0000, 0x0d28, 0x0000, 0x0d2a, 0x0000, 0x0d2c, 0x0000, 0x0d2e, + 0x0000, 0x0d30, 0x0000, 0x0d32, 0x0000, 0x21ce, 0x0000, 0x03a3, + 0x0000, 0x2202, 0x0000, 0x0d38, 0x0000, 0x2204, 0x0000, 0x21d2, + /* 0xff20 .. 0xff2f */ + 0x0000, 0x220c, 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, + 0x0000, 0x05c6, 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, + 0x0000, 0x05ce, 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, + 0x0000, 0x05d6, 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, + /* 0xff30 .. 0xff3f */ + 0x0000, 0x05e0, 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, + 0x0000, 0x05e4, 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, + 0x0000, 0x0de1, 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x21f6, + 0x0000, 0x2206, 0x0000, 0x21f8, 0x0000, 0x2289, 0x0000, 0x21dc, + /* 0xff40 .. 0xff4f */ + 0x0000, 0x0cd0, 0x0000, 0x0006, 0x0000, 0x05f0, 0x0000, 0x0624, + 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, 0x0000, 0x05fc, + 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, 0x0000, 0x05fe, + 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, 0x0000, 0x0019, + /* 0xff50 .. 0xff5f */ + 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, 0x0000, 0x0219, + 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, 0x0000, 0x0377, + 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, 0x0000, 0x21de, + 0x0000, 0x228b, 0x0000, 0x21e0, 0x0000, 0x228d, 0x0000, 0x228f, + /* 0xff60 .. 0xff6f */ + 0x0000, 0x2291, 0x0000, 0x21cc, 0x0000, 0x21ee, 0x0000, 0x21f0, + 0x0000, 0x21ca, 0x0000, 0x2293, 0x0000, 0x15b9, 0x0000, 0x2295, + 0x0000, 0x2297, 0x0000, 0x2299, 0x0000, 0x229b, 0x0000, 0x229d, + 0x0000, 0x229f, 0x0000, 0x22a1, 0x0000, 0x22a3, 0x0000, 0x22a5, + /* 0xff70 .. 0xff7f */ + 0x0000, 0x22a7, 0x0000, 0x155d, 0x0000, 0x155f, 0x0000, 0x1561, + 0x0000, 0x1563, 0x0000, 0x1565, 0x0000, 0x1567, 0x0000, 0x1569, + 0x0000, 0x156b, 0x0000, 0x156d, 0x0000, 0x156f, 0x0000, 0x1571, + 0x0000, 0x1573, 0x0000, 0x1575, 0x0000, 0x1577, 0x0000, 0x1579, + /* 0xff80 .. 0xff8f */ + 0x0000, 0x157b, 0x0000, 0x157d, 0x0000, 0x157f, 0x0000, 0x1581, + 0x0000, 0x1583, 0x0000, 0x1585, 0x0000, 0x1587, 0x0000, 0x1589, + 0x0000, 0x158b, 0x0000, 0x158d, 0x0000, 0x158f, 0x0000, 0x1591, + 0x0000, 0x1593, 0x0000, 0x1595, 0x0000, 0x1597, 0x0000, 0x1599, + /* 0xff90 .. 0xff9f */ + 0x0000, 0x159b, 0x0000, 0x159d, 0x0000, 0x159f, 0x0000, 0x15a1, + 0x0000, 0x15a3, 0x0000, 0x15a5, 0x0000, 0x15a7, 0x0000, 0x15a9, + 0x0000, 0x15ab, 0x0000, 0x15ad, 0x0000, 0x15af, 0x0000, 0x15b1, + 0x0000, 0x15b3, 0x0000, 0x22a9, 0x0000, 0x22ab, 0x0000, 0x22ad, + /* 0xffa0 .. 0xffaf */ + 0x0000, 0x12c0, 0x0000, 0x125a, 0x0000, 0x125c, 0x0000, 0x125e, + 0x0000, 0x1260, 0x0000, 0x1262, 0x0000, 0x1264, 0x0000, 0x1266, + 0x0000, 0x1268, 0x0000, 0x126a, 0x0000, 0x126c, 0x0000, 0x126e, + 0x0000, 0x1270, 0x0000, 0x1272, 0x0000, 0x1274, 0x0000, 0x1276, + /* 0xffb0 .. 0xffbf */ + 0x0000, 0x1278, 0x0000, 0x127a, 0x0000, 0x127c, 0x0000, 0x127e, + 0x0000, 0x1280, 0x0000, 0x1282, 0x0000, 0x1284, 0x0000, 0x1286, + 0x0000, 0x1288, 0x0000, 0x128a, 0x0000, 0x128c, 0x0000, 0x128e, + 0x0000, 0x1290, 0x0000, 0x1292, 0x0000, 0x1294, 0x0000, 0x0000, + /* 0xffc0 .. 0xffcf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1296, 0x0000, 0x1298, + 0x0000, 0x129a, 0x0000, 0x129c, 0x0000, 0x129e, 0x0000, 0x12a0, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x12a2, 0x0000, 0x12a4, + 0x0000, 0x12a6, 0x0000, 0x12a8, 0x0000, 0x12aa, 0x0000, 0x12ac, + /* 0xffd0 .. 0xffdf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x12ae, 0x0000, 0x12b0, + 0x0000, 0x12b2, 0x0000, 0x12b4, 0x0000, 0x12b6, 0x0000, 0x12b8, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x12ba, 0x0000, 0x12bc, + 0x0000, 0x12be, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xffe0 .. 0xffef */ + 0x0000, 0x22af, 0x0000, 0x22b1, 0x0000, 0x22b3, 0x0000, 0x0008, + 0x0000, 0x22b5, 0x0000, 0x22b7, 0x0000, 0x22b9, 0x0000, 0x0000, + 0x0000, 0x22bb, 0x0000, 0x22bd, 0x0000, 0x22bf, 0x0000, 0x22c1, + 0x0000, 0x22c3, 0x0000, 0x22c5, 0x0000, 0x22c7, 0x0000, 0x0000, + /* 0x11090 .. 0x1109f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x22c9, 0x22c9, 0x0000, 0x0000, + 0x22ce, 0x22ce, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x110a0 .. 0x110af */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x22d3, 0x22d3, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x11120 .. 0x1112f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x22d8, 0x22d8, 0x22dd, 0x22dd, + /* 0x11340 .. 0x1134f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x22e2, 0x22e2, + 0x22e7, 0x22e7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x114b0 .. 0x114bf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x22ec, 0x22ec, + 0x22f1, 0x22f1, 0x0000, 0x0000, 0x22f6, 0x22f6, 0x0000, 0x0000, + /* 0x115b0 .. 0x115bf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x22fb, 0x22fb, 0x2300, 0x2300, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1d150 .. 0x1d15f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x2305, 0x2305, 0x230a, 0x230a, + /* 0x1d160 .. 0x1d16f */ + 0x230f, 0x230f, 0x2316, 0x2316, 0x231d, 0x231d, 0x2324, 0x2324, + 0x232b, 0x232b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1d1b0 .. 0x1d1bf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2332, 0x2332, + 0x2337, 0x2337, 0x233c, 0x233c, 0x2343, 0x2343, 0x234a, 0x234a, + /* 0x1d1c0 .. 0x1d1cf */ + 0x2351, 0x2351, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1d400 .. 0x1d40f */ + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x05c6, + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x05ce, + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + /* 0x1d410 .. 0x1d41f */ + 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, 0x0000, 0x05e4, + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x0006, 0x0000, 0x05f0, + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + /* 0x1d420 .. 0x1d42f */ + 0x0000, 0x05fc, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + /* 0x1d430 .. 0x1d43f */ + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x05c6, + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x05ce, + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + /* 0x1d440 .. 0x1d44f */ + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, 0x0000, 0x05e4, + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x0006, 0x0000, 0x05f0, + /* 0x1d450 .. 0x1d45f */ + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + 0x0000, 0x05fc, 0x0000, 0x0000, 0x0000, 0x061e, 0x0000, 0x036d, + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + /* 0x1d460 .. 0x1d46f */ + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x05c6, + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x05ce, + /* 0x1d470 .. 0x1d47f */ + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, 0x0000, 0x05e4, + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + /* 0x1d480 .. 0x1d48f */ + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x0006, 0x0000, 0x05f0, + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + 0x0000, 0x05fc, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + /* 0x1d490 .. 0x1d49f */ + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + 0x0000, 0x05c0, 0x0000, 0x0000, 0x0000, 0x0d4b, 0x0000, 0x05c6, + /* 0x1d4a0 .. 0x1d4af */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x05cc, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + 0x0000, 0x0d62, 0x0000, 0x0000, 0x0000, 0x0fcf, 0x0000, 0x05e4, + /* 0x1d4b0 .. 0x1d4bf */ + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x0006, 0x0000, 0x05f0, + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x0000, 0x0000, 0x062a, + 0x0000, 0x0000, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + /* 0x1d4c0 .. 0x1d4cf */ + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + 0x0000, 0x0000, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + /* 0x1d4d0 .. 0x1d4df */ + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x05c6, + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x05ce, + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + /* 0x1d4e0 .. 0x1d4ef */ + 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, 0x0000, 0x05e4, + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x0006, 0x0000, 0x05f0, + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + /* 0x1d4f0 .. 0x1d4ff */ + 0x0000, 0x05fc, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + /* 0x1d500 .. 0x1d50f */ + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0000, 0x0000, 0x05c6, + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + /* 0x1d510 .. 0x1d51f */ + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + 0x0000, 0x0d62, 0x0000, 0x0000, 0x0000, 0x0fcf, 0x0000, 0x05e4, + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + 0x0000, 0x0fd1, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x05f0, + /* 0x1d520 .. 0x1d52f */ + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + 0x0000, 0x05fc, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + /* 0x1d530 .. 0x1d53f */ + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0000, 0x0000, 0x05c6, + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x0000, + /* 0x1d540 .. 0x1d54f */ + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + 0x0000, 0x05d8, 0x0000, 0x0000, 0x0000, 0x05dc, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0fcf, 0x0000, 0x05e4, + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + /* 0x1d550 .. 0x1d55f */ + 0x0000, 0x0fd1, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x05f0, + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + 0x0000, 0x05fc, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + /* 0x1d560 .. 0x1d56f */ + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x05c6, + /* 0x1d570 .. 0x1d57f */ + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x05ce, + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, 0x0000, 0x05e4, + /* 0x1d580 .. 0x1d58f */ + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x0006, 0x0000, 0x05f0, + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + 0x0000, 0x05fc, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + /* 0x1d590 .. 0x1d59f */ + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + /* 0x1d5a0 .. 0x1d5af */ + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x05c6, + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x05ce, + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + /* 0x1d5b0 .. 0x1d5bf */ + 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, 0x0000, 0x05e4, + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x0006, 0x0000, 0x05f0, + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + /* 0x1d5c0 .. 0x1d5cf */ + 0x0000, 0x05fc, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + /* 0x1d5d0 .. 0x1d5df */ + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x05c6, + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x05ce, + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + /* 0x1d5e0 .. 0x1d5ef */ + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, 0x0000, 0x05e4, + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x0006, 0x0000, 0x05f0, + /* 0x1d5f0 .. 0x1d5ff */ + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + 0x0000, 0x05fc, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + /* 0x1d600 .. 0x1d60f */ + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x05c6, + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x05ce, + /* 0x1d610 .. 0x1d61f */ + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, 0x0000, 0x05e4, + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + /* 0x1d620 .. 0x1d62f */ + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x0006, 0x0000, 0x05f0, + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + 0x0000, 0x05fc, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + /* 0x1d630 .. 0x1d63f */ + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x05c6, + /* 0x1d640 .. 0x1d64f */ + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x05ce, + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, 0x0000, 0x05e4, + /* 0x1d650 .. 0x1d65f */ + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x0006, 0x0000, 0x05f0, + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + 0x0000, 0x05fc, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + /* 0x1d660 .. 0x1d66f */ + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + /* 0x1d670 .. 0x1d67f */ + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x05c6, + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x05ce, + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + /* 0x1d680 .. 0x1d68f */ + 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, 0x0000, 0x05e4, + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x0006, 0x0000, 0x05f0, + 0x0000, 0x0624, 0x0000, 0x05f2, 0x0000, 0x05f4, 0x0000, 0x062a, + /* 0x1d690 .. 0x1d69f */ + 0x0000, 0x05fc, 0x0000, 0x0369, 0x0000, 0x061e, 0x0000, 0x036d, + 0x0000, 0x05fe, 0x0000, 0x038f, 0x0000, 0x0600, 0x0000, 0x0d3e, + 0x0000, 0x0019, 0x0000, 0x060a, 0x0000, 0x0fd3, 0x0000, 0x036f, + 0x0000, 0x0219, 0x0000, 0x060c, 0x0000, 0x060e, 0x0000, 0x0614, + /* 0x1d6a0 .. 0x1d6af */ + 0x0000, 0x0377, 0x0000, 0x0391, 0x0000, 0x0379, 0x0000, 0x0660, + 0x0000, 0x2358, 0x0000, 0x235a, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x235c, 0x0000, 0x235e, 0x0000, 0x0d80, 0x0000, 0x2360, + 0x0000, 0x2362, 0x0000, 0x2364, 0x0000, 0x2366, 0x0000, 0x0402, + /* 0x1d6b0 .. 0x1d6bf */ + 0x0000, 0x2368, 0x0000, 0x236a, 0x0000, 0x236c, 0x0000, 0x236e, + 0x0000, 0x2370, 0x0000, 0x2372, 0x0000, 0x2374, 0x0000, 0x0d82, + 0x0000, 0x2376, 0x0000, 0x0402, 0x0000, 0x0406, 0x0000, 0x2378, + 0x0000, 0x03f0, 0x0000, 0x237a, 0x0000, 0x237c, 0x0000, 0x237e, + /* 0x1d6c0 .. 0x1d6cf */ + 0x0000, 0x0d70, 0x0000, 0x2380, 0x0000, 0x2382, 0x0000, 0x03ec, + 0x0000, 0x0618, 0x0000, 0x061a, 0x0000, 0x0404, 0x0000, 0x2384, + 0x0000, 0x2386, 0x0000, 0x03ee, 0x0000, 0x0c3b, 0x0000, 0x03fc, + 0x0000, 0x2388, 0x0000, 0x0012, 0x0000, 0x238a, 0x0000, 0x238c, + /* 0x1d6d0 .. 0x1d6df */ + 0x0000, 0x238e, 0x0000, 0x03fa, 0x0000, 0x03fe, 0x0000, 0x0400, + 0x0000, 0x2390, 0x0000, 0x2392, 0x0000, 0x2394, 0x0000, 0x03f8, + 0x0000, 0x061c, 0x0000, 0x2396, 0x0000, 0x2398, 0x0000, 0x239a, + 0x0000, 0x0404, 0x0000, 0x03ee, 0x0000, 0x03fc, 0x0000, 0x03f8, + /* 0x1d6e0 .. 0x1d6ef */ + 0x0000, 0x03fe, 0x0000, 0x03fa, 0x0000, 0x235c, 0x0000, 0x235e, + 0x0000, 0x0d80, 0x0000, 0x2360, 0x0000, 0x2362, 0x0000, 0x2364, + 0x0000, 0x2366, 0x0000, 0x0402, 0x0000, 0x2368, 0x0000, 0x236a, + 0x0000, 0x236c, 0x0000, 0x236e, 0x0000, 0x2370, 0x0000, 0x2372, + /* 0x1d6f0 .. 0x1d6ff */ + 0x0000, 0x2374, 0x0000, 0x0d82, 0x0000, 0x2376, 0x0000, 0x0402, + 0x0000, 0x0406, 0x0000, 0x2378, 0x0000, 0x03f0, 0x0000, 0x237a, + 0x0000, 0x237c, 0x0000, 0x237e, 0x0000, 0x0d70, 0x0000, 0x2380, + 0x0000, 0x2382, 0x0000, 0x03ec, 0x0000, 0x0618, 0x0000, 0x061a, + /* 0x1d700 .. 0x1d70f */ + 0x0000, 0x0404, 0x0000, 0x2384, 0x0000, 0x2386, 0x0000, 0x03ee, + 0x0000, 0x0c3b, 0x0000, 0x03fc, 0x0000, 0x2388, 0x0000, 0x0012, + 0x0000, 0x238a, 0x0000, 0x238c, 0x0000, 0x238e, 0x0000, 0x03fa, + 0x0000, 0x03fe, 0x0000, 0x0400, 0x0000, 0x2390, 0x0000, 0x2392, + /* 0x1d710 .. 0x1d71f */ + 0x0000, 0x2394, 0x0000, 0x03f8, 0x0000, 0x061c, 0x0000, 0x2396, + 0x0000, 0x2398, 0x0000, 0x239a, 0x0000, 0x0404, 0x0000, 0x03ee, + 0x0000, 0x03fc, 0x0000, 0x03f8, 0x0000, 0x03fe, 0x0000, 0x03fa, + 0x0000, 0x235c, 0x0000, 0x235e, 0x0000, 0x0d80, 0x0000, 0x2360, + /* 0x1d720 .. 0x1d72f */ + 0x0000, 0x2362, 0x0000, 0x2364, 0x0000, 0x2366, 0x0000, 0x0402, + 0x0000, 0x2368, 0x0000, 0x236a, 0x0000, 0x236c, 0x0000, 0x236e, + 0x0000, 0x2370, 0x0000, 0x2372, 0x0000, 0x2374, 0x0000, 0x0d82, + 0x0000, 0x2376, 0x0000, 0x0402, 0x0000, 0x0406, 0x0000, 0x2378, + /* 0x1d730 .. 0x1d73f */ + 0x0000, 0x03f0, 0x0000, 0x237a, 0x0000, 0x237c, 0x0000, 0x237e, + 0x0000, 0x0d70, 0x0000, 0x2380, 0x0000, 0x2382, 0x0000, 0x03ec, + 0x0000, 0x0618, 0x0000, 0x061a, 0x0000, 0x0404, 0x0000, 0x2384, + 0x0000, 0x2386, 0x0000, 0x03ee, 0x0000, 0x0c3b, 0x0000, 0x03fc, + /* 0x1d740 .. 0x1d74f */ + 0x0000, 0x2388, 0x0000, 0x0012, 0x0000, 0x238a, 0x0000, 0x238c, + 0x0000, 0x238e, 0x0000, 0x03fa, 0x0000, 0x03fe, 0x0000, 0x0400, + 0x0000, 0x2390, 0x0000, 0x2392, 0x0000, 0x2394, 0x0000, 0x03f8, + 0x0000, 0x061c, 0x0000, 0x2396, 0x0000, 0x2398, 0x0000, 0x239a, + /* 0x1d750 .. 0x1d75f */ + 0x0000, 0x0404, 0x0000, 0x03ee, 0x0000, 0x03fc, 0x0000, 0x03f8, + 0x0000, 0x03fe, 0x0000, 0x03fa, 0x0000, 0x235c, 0x0000, 0x235e, + 0x0000, 0x0d80, 0x0000, 0x2360, 0x0000, 0x2362, 0x0000, 0x2364, + 0x0000, 0x2366, 0x0000, 0x0402, 0x0000, 0x2368, 0x0000, 0x236a, + /* 0x1d760 .. 0x1d76f */ + 0x0000, 0x236c, 0x0000, 0x236e, 0x0000, 0x2370, 0x0000, 0x2372, + 0x0000, 0x2374, 0x0000, 0x0d82, 0x0000, 0x2376, 0x0000, 0x0402, + 0x0000, 0x0406, 0x0000, 0x2378, 0x0000, 0x03f0, 0x0000, 0x237a, + 0x0000, 0x237c, 0x0000, 0x237e, 0x0000, 0x0d70, 0x0000, 0x2380, + /* 0x1d770 .. 0x1d77f */ + 0x0000, 0x2382, 0x0000, 0x03ec, 0x0000, 0x0618, 0x0000, 0x061a, + 0x0000, 0x0404, 0x0000, 0x2384, 0x0000, 0x2386, 0x0000, 0x03ee, + 0x0000, 0x0c3b, 0x0000, 0x03fc, 0x0000, 0x2388, 0x0000, 0x0012, + 0x0000, 0x238a, 0x0000, 0x238c, 0x0000, 0x238e, 0x0000, 0x03fa, + /* 0x1d780 .. 0x1d78f */ + 0x0000, 0x03fe, 0x0000, 0x0400, 0x0000, 0x2390, 0x0000, 0x2392, + 0x0000, 0x2394, 0x0000, 0x03f8, 0x0000, 0x061c, 0x0000, 0x2396, + 0x0000, 0x2398, 0x0000, 0x239a, 0x0000, 0x0404, 0x0000, 0x03ee, + 0x0000, 0x03fc, 0x0000, 0x03f8, 0x0000, 0x03fe, 0x0000, 0x03fa, + /* 0x1d790 .. 0x1d79f */ + 0x0000, 0x235c, 0x0000, 0x235e, 0x0000, 0x0d80, 0x0000, 0x2360, + 0x0000, 0x2362, 0x0000, 0x2364, 0x0000, 0x2366, 0x0000, 0x0402, + 0x0000, 0x2368, 0x0000, 0x236a, 0x0000, 0x236c, 0x0000, 0x236e, + 0x0000, 0x2370, 0x0000, 0x2372, 0x0000, 0x2374, 0x0000, 0x0d82, + /* 0x1d7a0 .. 0x1d7af */ + 0x0000, 0x2376, 0x0000, 0x0402, 0x0000, 0x0406, 0x0000, 0x2378, + 0x0000, 0x03f0, 0x0000, 0x237a, 0x0000, 0x237c, 0x0000, 0x237e, + 0x0000, 0x0d70, 0x0000, 0x2380, 0x0000, 0x2382, 0x0000, 0x03ec, + 0x0000, 0x0618, 0x0000, 0x061a, 0x0000, 0x0404, 0x0000, 0x2384, + /* 0x1d7b0 .. 0x1d7bf */ + 0x0000, 0x2386, 0x0000, 0x03ee, 0x0000, 0x0c3b, 0x0000, 0x03fc, + 0x0000, 0x2388, 0x0000, 0x0012, 0x0000, 0x238a, 0x0000, 0x238c, + 0x0000, 0x238e, 0x0000, 0x03fa, 0x0000, 0x03fe, 0x0000, 0x0400, + 0x0000, 0x2390, 0x0000, 0x2392, 0x0000, 0x2394, 0x0000, 0x03f8, + /* 0x1d7c0 .. 0x1d7cf */ + 0x0000, 0x061c, 0x0000, 0x2396, 0x0000, 0x2398, 0x0000, 0x239a, + 0x0000, 0x0404, 0x0000, 0x03ee, 0x0000, 0x03fc, 0x0000, 0x03f8, + 0x0000, 0x03fe, 0x0000, 0x03fa, 0x0000, 0x239c, 0x0000, 0x239e, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0d26, 0x0000, 0x0017, + /* 0x1d7d0 .. 0x1d7df */ + 0x0000, 0x000b, 0x0000, 0x000d, 0x0000, 0x0d28, 0x0000, 0x0d2a, + 0x0000, 0x0d2c, 0x0000, 0x0d2e, 0x0000, 0x0d30, 0x0000, 0x0d32, + 0x0000, 0x0d26, 0x0000, 0x0017, 0x0000, 0x000b, 0x0000, 0x000d, + 0x0000, 0x0d28, 0x0000, 0x0d2a, 0x0000, 0x0d2c, 0x0000, 0x0d2e, + /* 0x1d7e0 .. 0x1d7ef */ + 0x0000, 0x0d30, 0x0000, 0x0d32, 0x0000, 0x0d26, 0x0000, 0x0017, + 0x0000, 0x000b, 0x0000, 0x000d, 0x0000, 0x0d28, 0x0000, 0x0d2a, + 0x0000, 0x0d2c, 0x0000, 0x0d2e, 0x0000, 0x0d30, 0x0000, 0x0d32, + 0x0000, 0x0d26, 0x0000, 0x0017, 0x0000, 0x000b, 0x0000, 0x000d, + /* 0x1d7f0 .. 0x1d7ff */ + 0x0000, 0x0d28, 0x0000, 0x0d2a, 0x0000, 0x0d2c, 0x0000, 0x0d2e, + 0x0000, 0x0d30, 0x0000, 0x0d32, 0x0000, 0x0d26, 0x0000, 0x0017, + 0x0000, 0x000b, 0x0000, 0x000d, 0x0000, 0x0d28, 0x0000, 0x0d2a, + 0x0000, 0x0d2c, 0x0000, 0x0d2e, 0x0000, 0x0d30, 0x0000, 0x0d32, + /* 0x1ee00 .. 0x1ee0f */ + 0x0000, 0x223a, 0x0000, 0x223c, 0x0000, 0x2244, 0x0000, 0x224a, + 0x0000, 0x0000, 0x0000, 0x2270, 0x0000, 0x2250, 0x0000, 0x2246, + 0x0000, 0x225a, 0x0000, 0x2272, 0x0000, 0x2266, 0x0000, 0x2268, + 0x0000, 0x226a, 0x0000, 0x226c, 0x0000, 0x2252, 0x0000, 0x225e, + /* 0x1ee10 .. 0x1ee1f */ + 0x0000, 0x2262, 0x0000, 0x2256, 0x0000, 0x2264, 0x0000, 0x224e, + 0x0000, 0x2254, 0x0000, 0x2240, 0x0000, 0x2242, 0x0000, 0x2248, + 0x0000, 0x224c, 0x0000, 0x2258, 0x0000, 0x225c, 0x0000, 0x2260, + 0x0000, 0x23a0, 0x0000, 0x1dca, 0x0000, 0x23a2, 0x0000, 0x23a4, + /* 0x1ee20 .. 0x1ee2f */ + 0x0000, 0x0000, 0x0000, 0x223c, 0x0000, 0x2244, 0x0000, 0x0000, + 0x0000, 0x226e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2246, + 0x0000, 0x0000, 0x0000, 0x2272, 0x0000, 0x2266, 0x0000, 0x2268, + 0x0000, 0x226a, 0x0000, 0x226c, 0x0000, 0x2252, 0x0000, 0x225e, + /* 0x1ee30 .. 0x1ee3f */ + 0x0000, 0x2262, 0x0000, 0x2256, 0x0000, 0x2264, 0x0000, 0x0000, + 0x0000, 0x2254, 0x0000, 0x2240, 0x0000, 0x2242, 0x0000, 0x2248, + 0x0000, 0x0000, 0x0000, 0x2258, 0x0000, 0x0000, 0x0000, 0x2260, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1ee40 .. 0x1ee4f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2244, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2246, + 0x0000, 0x0000, 0x0000, 0x2272, 0x0000, 0x0000, 0x0000, 0x2268, + 0x0000, 0x0000, 0x0000, 0x226c, 0x0000, 0x2252, 0x0000, 0x225e, + /* 0x1ee50 .. 0x1ee5f */ + 0x0000, 0x0000, 0x0000, 0x2256, 0x0000, 0x2264, 0x0000, 0x0000, + 0x0000, 0x2254, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2248, + 0x0000, 0x0000, 0x0000, 0x2258, 0x0000, 0x0000, 0x0000, 0x2260, + 0x0000, 0x0000, 0x0000, 0x1dca, 0x0000, 0x0000, 0x0000, 0x23a4, + /* 0x1ee60 .. 0x1ee6f */ + 0x0000, 0x0000, 0x0000, 0x223c, 0x0000, 0x2244, 0x0000, 0x0000, + 0x0000, 0x226e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2246, + 0x0000, 0x225a, 0x0000, 0x2272, 0x0000, 0x2266, 0x0000, 0x0000, + 0x0000, 0x226a, 0x0000, 0x226c, 0x0000, 0x2252, 0x0000, 0x225e, + /* 0x1ee70 .. 0x1ee7f */ + 0x0000, 0x2262, 0x0000, 0x2256, 0x0000, 0x2264, 0x0000, 0x0000, + 0x0000, 0x2254, 0x0000, 0x2240, 0x0000, 0x2242, 0x0000, 0x2248, + 0x0000, 0x0000, 0x0000, 0x2258, 0x0000, 0x225c, 0x0000, 0x2260, + 0x0000, 0x23a0, 0x0000, 0x0000, 0x0000, 0x23a2, 0x0000, 0x0000, + /* 0x1ee80 .. 0x1ee8f */ + 0x0000, 0x223a, 0x0000, 0x223c, 0x0000, 0x2244, 0x0000, 0x224a, + 0x0000, 0x226e, 0x0000, 0x2270, 0x0000, 0x2250, 0x0000, 0x2246, + 0x0000, 0x225a, 0x0000, 0x2272, 0x0000, 0x0000, 0x0000, 0x2268, + 0x0000, 0x226a, 0x0000, 0x226c, 0x0000, 0x2252, 0x0000, 0x225e, + /* 0x1ee90 .. 0x1ee9f */ + 0x0000, 0x2262, 0x0000, 0x2256, 0x0000, 0x2264, 0x0000, 0x224e, + 0x0000, 0x2254, 0x0000, 0x2240, 0x0000, 0x2242, 0x0000, 0x2248, + 0x0000, 0x224c, 0x0000, 0x2258, 0x0000, 0x225c, 0x0000, 0x2260, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1eea0 .. 0x1eeaf */ + 0x0000, 0x0000, 0x0000, 0x223c, 0x0000, 0x2244, 0x0000, 0x224a, + 0x0000, 0x0000, 0x0000, 0x2270, 0x0000, 0x2250, 0x0000, 0x2246, + 0x0000, 0x225a, 0x0000, 0x2272, 0x0000, 0x0000, 0x0000, 0x2268, + 0x0000, 0x226a, 0x0000, 0x226c, 0x0000, 0x2252, 0x0000, 0x225e, + /* 0x1eeb0 .. 0x1eebf */ + 0x0000, 0x2262, 0x0000, 0x2256, 0x0000, 0x2264, 0x0000, 0x224e, + 0x0000, 0x2254, 0x0000, 0x2240, 0x0000, 0x2242, 0x0000, 0x2248, + 0x0000, 0x224c, 0x0000, 0x2258, 0x0000, 0x225c, 0x0000, 0x2260, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1f100 .. 0x1f10f */ + 0x0000, 0x23a6, 0x0000, 0x23a9, 0x0000, 0x23ac, 0x0000, 0x23af, + 0x0000, 0x23b2, 0x0000, 0x23b5, 0x0000, 0x23b8, 0x0000, 0x23bb, + 0x0000, 0x23be, 0x0000, 0x23c1, 0x0000, 0x23c4, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1f110 .. 0x1f11f */ + 0x0000, 0x23c7, 0x0000, 0x23cb, 0x0000, 0x23cf, 0x0000, 0x23d3, + 0x0000, 0x23d7, 0x0000, 0x23db, 0x0000, 0x23df, 0x0000, 0x23e3, + 0x0000, 0x23e7, 0x0000, 0x23eb, 0x0000, 0x23ef, 0x0000, 0x23f3, + 0x0000, 0x23f7, 0x0000, 0x23fb, 0x0000, 0x23ff, 0x0000, 0x2403, + /* 0x1f120 .. 0x1f12f */ + 0x0000, 0x2407, 0x0000, 0x240b, 0x0000, 0x240f, 0x0000, 0x2413, + 0x0000, 0x2417, 0x0000, 0x241b, 0x0000, 0x241f, 0x0000, 0x2423, + 0x0000, 0x2427, 0x0000, 0x242b, 0x0000, 0x242f, 0x0000, 0x0d4b, + 0x0000, 0x05e2, 0x0000, 0x2433, 0x0000, 0x2436, 0x0000, 0x0000, + /* 0x1f130 .. 0x1f13f */ + 0x0000, 0x05c0, 0x0000, 0x05c4, 0x0000, 0x0d4b, 0x0000, 0x05c6, + 0x0000, 0x05c8, 0x0000, 0x0d72, 0x0000, 0x05cc, 0x0000, 0x05ce, + 0x0000, 0x05d0, 0x0000, 0x05d2, 0x0000, 0x05d4, 0x0000, 0x05d6, + 0x0000, 0x05d8, 0x0000, 0x05da, 0x0000, 0x05dc, 0x0000, 0x05e0, + /* 0x1f140 .. 0x1f14f */ + 0x0000, 0x0d62, 0x0000, 0x05e2, 0x0000, 0x0fcf, 0x0000, 0x05e4, + 0x0000, 0x05e6, 0x0000, 0x0dd0, 0x0000, 0x05e8, 0x0000, 0x0de1, + 0x0000, 0x0fd1, 0x0000, 0x0d6e, 0x0000, 0x2439, 0x0000, 0x18c2, + 0x0000, 0x243c, 0x0000, 0x243f, 0x0000, 0x2442, 0x0000, 0x2446, + /* 0x1f160 .. 0x1f16f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2449, 0x0000, 0x244c, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1f190 .. 0x1f19f */ + 0x0000, 0x244f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1f200 .. 0x1f20f */ + 0x0000, 0x2452, 0x0000, 0x2455, 0x0000, 0x1571, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1f210 .. 0x1f21f */ + 0x0000, 0x106c, 0x0000, 0x2458, 0x0000, 0x245a, 0x0000, 0x1221, + 0x0000, 0x0ffa, 0x0000, 0x245c, 0x0000, 0x245e, 0x0000, 0x1326, + 0x0000, 0x2460, 0x0000, 0x2462, 0x0000, 0x2464, 0x0000, 0x1b31, + 0x0000, 0x2466, 0x0000, 0x2468, 0x0000, 0x246a, 0x0000, 0x246c, + /* 0x1f220 .. 0x1f22f */ + 0x0000, 0x246e, 0x0000, 0x2470, 0x0000, 0x10b4, 0x0000, 0x2472, + 0x0000, 0x2474, 0x0000, 0x2476, 0x0000, 0x2478, 0x0000, 0x247a, + 0x0000, 0x247c, 0x0000, 0x0fee, 0x0000, 0x1316, 0x0000, 0x247e, + 0x0000, 0x14e7, 0x0000, 0x131c, 0x0000, 0x14e9, 0x0000, 0x2480, + /* 0x1f230 .. 0x1f23f */ + 0x0000, 0x1124, 0x0000, 0x2482, 0x0000, 0x2484, 0x0000, 0x2486, + 0x0000, 0x2488, 0x0000, 0x248a, 0x0000, 0x14c5, 0x0000, 0x1080, + 0x0000, 0x248c, 0x0000, 0x248e, 0x0000, 0x2490, 0x0000, 0x2492, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1f240 .. 0x1f24f */ + 0x0000, 0x2494, 0x0000, 0x2498, 0x0000, 0x249c, 0x0000, 0x24a0, + 0x0000, 0x24a4, 0x0000, 0x24a8, 0x0000, 0x24ac, 0x0000, 0x24b0, + 0x0000, 0x24b4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1f250 .. 0x1f25f */ + 0x0000, 0x24b8, 0x0000, 0x24ba, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2f800 .. 0x2f80f */ + 0x24bc, 0x24bc, 0x24be, 0x24be, 0x24c0, 0x24c0, 0x24c2, 0x24c2, + 0x24c5, 0x24c5, 0x1beb, 0x1beb, 0x24c7, 0x24c7, 0x24c9, 0x24c9, + 0x24cb, 0x24cb, 0x24cd, 0x24cd, 0x1bed, 0x1bed, 0x24cf, 0x24cf, + 0x24d1, 0x24d1, 0x24d3, 0x24d3, 0x1bef, 0x1bef, 0x24d6, 0x24d6, + /* 0x2f810 .. 0x2f81f */ + 0x24d8, 0x24d8, 0x24da, 0x24da, 0x24dc, 0x24dc, 0x24df, 0x24df, + 0x24e1, 0x24e1, 0x246a, 0x246a, 0x24e3, 0x24e3, 0x24e6, 0x24e6, + 0x24e8, 0x24e8, 0x24ea, 0x24ea, 0x24ec, 0x24ec, 0x1c5e, 0x1c5e, + 0x24ee, 0x24ee, 0x100e, 0x100e, 0x24f1, 0x24f1, 0x24f3, 0x24f3, + /* 0x2f820 .. 0x2f82f */ + 0x24f5, 0x24f5, 0x24f7, 0x24f7, 0x248e, 0x248e, 0x24f9, 0x24f9, + 0x24fb, 0x24fb, 0x1c68, 0x1c68, 0x1bf1, 0x1bf1, 0x1bf3, 0x1bf3, + 0x1c6a, 0x1c6a, 0x24fd, 0x24fd, 0x24ff, 0x24ff, 0x1a85, 0x1a85, + 0x2501, 0x2501, 0x1bf5, 0x1bf5, 0x2503, 0x2503, 0x2505, 0x2505, + /* 0x2f830 .. 0x2f83f */ + 0x2507, 0x2507, 0x2509, 0x2509, 0x2509, 0x2509, 0x2509, 0x2509, + 0x250b, 0x250b, 0x250e, 0x250e, 0x2510, 0x2510, 0x2512, 0x2512, + 0x2514, 0x2514, 0x2517, 0x2517, 0x2519, 0x2519, 0x251b, 0x251b, + 0x251d, 0x251d, 0x251f, 0x251f, 0x2521, 0x2521, 0x2523, 0x2523, + /* 0x2f840 .. 0x2f84f */ + 0x2525, 0x2525, 0x2527, 0x2527, 0x2529, 0x2529, 0x252b, 0x252b, + 0x252d, 0x252d, 0x252f, 0x252f, 0x252f, 0x252f, 0x1c6e, 0x1c6e, + 0x2531, 0x2531, 0x2533, 0x2533, 0x2535, 0x2535, 0x2537, 0x2537, + 0x1bf9, 0x1bf9, 0x2539, 0x2539, 0x253b, 0x253b, 0x253d, 0x253d, + /* 0x2f850 .. 0x2f85f */ + 0x1ba9, 0x1ba9, 0x253f, 0x253f, 0x2541, 0x2541, 0x2543, 0x2543, + 0x2545, 0x2545, 0x2547, 0x2547, 0x2549, 0x2549, 0x254b, 0x254b, + 0x254d, 0x254d, 0x254f, 0x254f, 0x2552, 0x2552, 0x2554, 0x2554, + 0x2556, 0x2556, 0x245c, 0x245c, 0x2558, 0x2558, 0x255a, 0x255a, + /* 0x2f860 .. 0x2f86f */ + 0x255c, 0x255c, 0x255f, 0x255f, 0x2562, 0x2562, 0x2564, 0x2564, + 0x2566, 0x2566, 0x2568, 0x2568, 0x256a, 0x256a, 0x256c, 0x256c, + 0x256e, 0x256e, 0x2570, 0x2570, 0x2572, 0x2572, 0x2572, 0x2572, + 0x2574, 0x2574, 0x2577, 0x2577, 0x2579, 0x2579, 0x1a7d, 0x1a7d, + /* 0x2f870 .. 0x2f87f */ + 0x257b, 0x257b, 0x257d, 0x257d, 0x2580, 0x2580, 0x2582, 0x2582, + 0x2584, 0x2584, 0x1042, 0x1042, 0x2586, 0x2586, 0x2588, 0x2588, + 0x1046, 0x1046, 0x258a, 0x258a, 0x258c, 0x258c, 0x258e, 0x258e, + 0x2591, 0x2591, 0x2593, 0x2593, 0x2596, 0x2596, 0x2598, 0x2598, + /* 0x2f880 .. 0x2f88f */ + 0x259a, 0x259a, 0x259c, 0x259c, 0x259e, 0x259e, 0x25a0, 0x25a0, + 0x25a2, 0x25a2, 0x25a4, 0x25a4, 0x25a6, 0x25a6, 0x25a8, 0x25a8, + 0x25aa, 0x25aa, 0x25ac, 0x25ac, 0x25af, 0x25af, 0x25b1, 0x25b1, + 0x25b3, 0x25b3, 0x25b5, 0x25b5, 0x1a15, 0x1a15, 0x25b7, 0x25b7, + /* 0x2f890 .. 0x2f89f */ + 0x105a, 0x105a, 0x25ba, 0x25ba, 0x25ba, 0x25ba, 0x25bd, 0x25bd, + 0x25bf, 0x25bf, 0x25bf, 0x25bf, 0x25c1, 0x25c1, 0x25c3, 0x25c3, + 0x25c6, 0x25c6, 0x25c9, 0x25c9, 0x25cb, 0x25cb, 0x25cd, 0x25cd, + 0x25cf, 0x25cf, 0x25d1, 0x25d1, 0x25d3, 0x25d3, 0x25d5, 0x25d5, + /* 0x2f8a0 .. 0x2f8af */ + 0x25d7, 0x25d7, 0x25d9, 0x25d9, 0x25db, 0x25db, 0x1c03, 0x1c03, + 0x25dd, 0x25dd, 0x25e0, 0x25e0, 0x25e2, 0x25e2, 0x25e4, 0x25e4, + 0x1c86, 0x1c86, 0x25e4, 0x25e4, 0x25e6, 0x25e6, 0x1c07, 0x1c07, + 0x25e8, 0x25e8, 0x25ea, 0x25ea, 0x25ec, 0x25ec, 0x25ee, 0x25ee, + /* 0x2f8b0 .. 0x2f8bf */ + 0x1c09, 0x1c09, 0x19df, 0x19df, 0x25f0, 0x25f0, 0x25f2, 0x25f2, + 0x25f4, 0x25f4, 0x25f6, 0x25f6, 0x25f8, 0x25f8, 0x25fa, 0x25fa, + 0x25fc, 0x25fc, 0x25ff, 0x25ff, 0x2601, 0x2601, 0x2603, 0x2603, + 0x2605, 0x2605, 0x2607, 0x2607, 0x2609, 0x2609, 0x260c, 0x260c, + /* 0x2f8c0 .. 0x2f8cf */ + 0x260e, 0x260e, 0x2610, 0x2610, 0x2612, 0x2612, 0x2614, 0x2614, + 0x2616, 0x2616, 0x2618, 0x2618, 0x261a, 0x261a, 0x261c, 0x261c, + 0x1c0b, 0x1c0b, 0x261e, 0x261e, 0x2620, 0x2620, 0x2623, 0x2623, + 0x2625, 0x2625, 0x2627, 0x2627, 0x2629, 0x2629, 0x1c0f, 0x1c0f, + /* 0x2f8d0 .. 0x2f8df */ + 0x262b, 0x262b, 0x262d, 0x262d, 0x262f, 0x262f, 0x2631, 0x2631, + 0x2633, 0x2633, 0x2635, 0x2635, 0x2637, 0x2637, 0x2639, 0x2639, + 0x1a17, 0x1a17, 0x1c96, 0x1c96, 0x263b, 0x263b, 0x263d, 0x263d, + 0x263f, 0x263f, 0x2641, 0x2641, 0x2644, 0x2644, 0x2646, 0x2646, + /* 0x2f8e0 .. 0x2f8ef */ + 0x2648, 0x2648, 0x264a, 0x264a, 0x1c11, 0x1c11, 0x264c, 0x264c, + 0x264f, 0x264f, 0x2651, 0x2651, 0x2653, 0x2653, 0x1ced, 0x1ced, + 0x2655, 0x2655, 0x2657, 0x2657, 0x2659, 0x2659, 0x265b, 0x265b, + 0x265d, 0x265d, 0x2660, 0x2660, 0x2662, 0x2662, 0x2664, 0x2664, + /* 0x2f8f0 .. 0x2f8ff */ + 0x2666, 0x2666, 0x2669, 0x2669, 0x266b, 0x266b, 0x266d, 0x266d, + 0x266f, 0x266f, 0x1a9f, 0x1a9f, 0x2671, 0x2671, 0x2673, 0x2673, + 0x2676, 0x2676, 0x2679, 0x2679, 0x267c, 0x267c, 0x267e, 0x267e, + 0x2681, 0x2681, 0x2683, 0x2683, 0x2685, 0x2685, 0x2687, 0x2687, + /* 0x2f900 .. 0x2f90f */ + 0x2689, 0x2689, 0x1c13, 0x1c13, 0x1b45, 0x1b45, 0x268b, 0x268b, + 0x268d, 0x268d, 0x268f, 0x268f, 0x2691, 0x2691, 0x2694, 0x2694, + 0x2696, 0x2696, 0x2698, 0x2698, 0x269a, 0x269a, 0x1c9c, 0x1c9c, + 0x269c, 0x269c, 0x269e, 0x269e, 0x26a1, 0x26a1, 0x26a3, 0x26a3, + /* 0x2f910 .. 0x2f91f */ + 0x26a5, 0x26a5, 0x26a8, 0x26a8, 0x26ab, 0x26ab, 0x26ad, 0x26ad, + 0x1c9e, 0x1c9e, 0x26af, 0x26af, 0x26b1, 0x26b1, 0x26b3, 0x26b3, + 0x26b5, 0x26b5, 0x26b7, 0x26b7, 0x26b9, 0x26b9, 0x26bb, 0x26bb, + 0x26be, 0x26be, 0x26c0, 0x26c0, 0x26c3, 0x26c3, 0x26c5, 0x26c5, + /* 0x2f920 .. 0x2f92f */ + 0x26c8, 0x26c8, 0x1ca2, 0x1ca2, 0x26ca, 0x26ca, 0x26cc, 0x26cc, + 0x26cf, 0x26cf, 0x26d1, 0x26d1, 0x26d3, 0x26d3, 0x26d6, 0x26d6, + 0x26d9, 0x26d9, 0x26db, 0x26db, 0x26dd, 0x26dd, 0x26df, 0x26df, + 0x26e1, 0x26e1, 0x26e1, 0x26e1, 0x26e3, 0x26e3, 0x26e5, 0x26e5, + /* 0x2f930 .. 0x2f93f */ + 0x1ca6, 0x1ca6, 0x26e7, 0x26e7, 0x26e9, 0x26e9, 0x26eb, 0x26eb, + 0x26ed, 0x26ed, 0x26ef, 0x26ef, 0x26f2, 0x26f2, 0x26f4, 0x26f4, + 0x1a83, 0x1a83, 0x26f7, 0x26f7, 0x26fa, 0x26fa, 0x26fc, 0x26fc, + 0x26ff, 0x26ff, 0x2702, 0x2702, 0x2705, 0x2705, 0x2707, 0x2707, + /* 0x2f940 .. 0x2f94f */ + 0x1cb2, 0x1cb2, 0x2709, 0x2709, 0x270c, 0x270c, 0x270f, 0x270f, + 0x2712, 0x2712, 0x2715, 0x2715, 0x2717, 0x2717, 0x2717, 0x2717, + 0x1cb4, 0x1cb4, 0x1cf1, 0x1cf1, 0x2719, 0x2719, 0x271b, 0x271b, + 0x271d, 0x271d, 0x271f, 0x271f, 0x2722, 0x2722, 0x1a39, 0x1a39, + /* 0x2f950 .. 0x2f95f */ + 0x1cb8, 0x1cb8, 0x2724, 0x2724, 0x2726, 0x2726, 0x1c27, 0x1c27, + 0x2729, 0x2729, 0x272c, 0x272c, 0x1bd1, 0x1bd1, 0x272f, 0x272f, + 0x2731, 0x2731, 0x1c2d, 0x1c2d, 0x2733, 0x2733, 0x2735, 0x2735, + 0x2737, 0x2737, 0x273a, 0x273a, 0x273a, 0x273a, 0x273d, 0x273d, + /* 0x2f960 .. 0x2f96f */ + 0x273f, 0x273f, 0x2741, 0x2741, 0x2744, 0x2744, 0x2746, 0x2746, + 0x2748, 0x2748, 0x274a, 0x274a, 0x274d, 0x274d, 0x274f, 0x274f, + 0x2751, 0x2751, 0x2753, 0x2753, 0x2755, 0x2755, 0x2757, 0x2757, + 0x275a, 0x275a, 0x275c, 0x275c, 0x275e, 0x275e, 0x2760, 0x2760, + /* 0x2f970 .. 0x2f97f */ + 0x2762, 0x2762, 0x2764, 0x2764, 0x2766, 0x2766, 0x2769, 0x2769, + 0x276c, 0x276c, 0x276e, 0x276e, 0x2771, 0x2771, 0x2773, 0x2773, + 0x2776, 0x2776, 0x2778, 0x2778, 0x1c39, 0x1c39, 0x277a, 0x277a, + 0x277d, 0x277d, 0x2780, 0x2780, 0x2782, 0x2782, 0x2785, 0x2785, + /* 0x2f980 .. 0x2f98f */ + 0x2787, 0x2787, 0x278a, 0x278a, 0x278c, 0x278c, 0x278e, 0x278e, + 0x2790, 0x2790, 0x2792, 0x2792, 0x2794, 0x2794, 0x2796, 0x2796, + 0x2799, 0x2799, 0x279c, 0x279c, 0x279f, 0x279f, 0x25bd, 0x25bd, + 0x27a2, 0x27a2, 0x27a4, 0x27a4, 0x27a6, 0x27a6, 0x27a8, 0x27a8, + /* 0x2f990 .. 0x2f99f */ + 0x27aa, 0x27aa, 0x27ac, 0x27ac, 0x27ae, 0x27ae, 0x27b0, 0x27b0, + 0x27b2, 0x27b2, 0x27b4, 0x27b4, 0x27b6, 0x27b6, 0x27b8, 0x27b8, + 0x1aa5, 0x1aa5, 0x27bb, 0x27bb, 0x27bd, 0x27bd, 0x27bf, 0x27bf, + 0x27c1, 0x27c1, 0x27c3, 0x27c3, 0x27c5, 0x27c5, 0x1c3f, 0x1c3f, + /* 0x2f9a0 .. 0x2f9af */ + 0x27c7, 0x27c7, 0x27c9, 0x27c9, 0x27cb, 0x27cb, 0x27cd, 0x27cd, + 0x27cf, 0x27cf, 0x27d2, 0x27d2, 0x27d5, 0x27d5, 0x27d8, 0x27d8, + 0x27da, 0x27da, 0x27dc, 0x27dc, 0x27de, 0x27de, 0x27e0, 0x27e0, + 0x27e3, 0x27e3, 0x27e5, 0x27e5, 0x27e8, 0x27e8, 0x27ea, 0x27ea, + /* 0x2f9b0 .. 0x2f9bf */ + 0x27ec, 0x27ec, 0x27ef, 0x27ef, 0x27f2, 0x27f2, 0x27f4, 0x27f4, + 0x1a2f, 0x1a2f, 0x27f6, 0x27f6, 0x27f8, 0x27f8, 0x27fa, 0x27fa, + 0x27fc, 0x27fc, 0x27fe, 0x27fe, 0x2800, 0x2800, 0x1cc6, 0x1cc6, + 0x2802, 0x2802, 0x2804, 0x2804, 0x2806, 0x2806, 0x2808, 0x2808, + /* 0x2f9c0 .. 0x2f9cf */ + 0x280a, 0x280a, 0x280c, 0x280c, 0x280e, 0x280e, 0x2810, 0x2810, + 0x110e, 0x110e, 0x2812, 0x2812, 0x2815, 0x2815, 0x2817, 0x2817, + 0x2819, 0x2819, 0x281b, 0x281b, 0x281d, 0x281d, 0x281f, 0x281f, + 0x2822, 0x2822, 0x2825, 0x2825, 0x2827, 0x2827, 0x2829, 0x2829, + /* 0x2f9d0 .. 0x2f9df */ + 0x1cd0, 0x1cd0, 0x1cd2, 0x1cd2, 0x111c, 0x111c, 0x282b, 0x282b, + 0x282e, 0x282e, 0x2830, 0x2830, 0x2832, 0x2832, 0x2834, 0x2834, + 0x2836, 0x2836, 0x2839, 0x2839, 0x283c, 0x283c, 0x283e, 0x283e, + 0x2840, 0x2840, 0x2842, 0x2842, 0x2845, 0x2845, 0x1cd4, 0x1cd4, + /* 0x2f9e0 .. 0x2f9ef */ + 0x2847, 0x2847, 0x284a, 0x284a, 0x284d, 0x284d, 0x284f, 0x284f, + 0x2851, 0x2851, 0x2853, 0x2853, 0x2856, 0x2856, 0x2858, 0x2858, + 0x285a, 0x285a, 0x285c, 0x285c, 0x285e, 0x285e, 0x2860, 0x2860, + 0x2862, 0x2862, 0x2864, 0x2864, 0x2867, 0x2867, 0x2869, 0x2869, + /* 0x2f9f0 .. 0x2f9ff */ + 0x286b, 0x286b, 0x286d, 0x286d, 0x2870, 0x2870, 0x2872, 0x2872, + 0x2874, 0x2874, 0x2876, 0x2876, 0x2878, 0x2878, 0x287b, 0x287b, + 0x287e, 0x287e, 0x2880, 0x2880, 0x2882, 0x2882, 0x2884, 0x2884, + 0x2887, 0x2887, 0x2889, 0x2889, 0x1ce0, 0x1ce0, 0x1ce0, 0x1ce0, + /* 0x2fa00 .. 0x2fa0f */ + 0x288c, 0x288c, 0x288e, 0x288e, 0x2891, 0x2891, 0x2893, 0x2893, + 0x2895, 0x2895, 0x2897, 0x2897, 0x2899, 0x2899, 0x289b, 0x289b, + 0x289d, 0x289d, 0x289f, 0x289f, 0x1ce2, 0x1ce2, 0x28a2, 0x28a2, + 0x28a4, 0x28a4, 0x28a6, 0x28a6, 0x28a8, 0x28a8, 0x28aa, 0x28aa, + /* 0x2fa10 .. 0x2fa1f */ + 0x28ac, 0x28ac, 0x28af, 0x28af, 0x28b1, 0x28b1, 0x28b4, 0x28b4, + 0x28b7, 0x28b7, 0x117c, 0x117c, 0x28ba, 0x28ba, 0x1184, 0x1184, + 0x28bc, 0x28bc, 0x28be, 0x28be, 0x28c0, 0x28c0, 0x28c2, 0x28c2, + 0x118e, 0x118e, 0x28c4, 0x28c4, 0x0000, 0x0000, 0x0000, 0x0000 }; -unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +static const WCHAR *unicode_table_lookup( UINT cp, int compat, const BYTE *idx1, UINT scale_idx1, + const USHORT *idx2, UINT scale_idx2, const USHORT *offsets, + UINT scale_off, const WCHAR *data, UINT scale_data ) { - const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - unsigned int res; + USHORT a, b, c, d; + a = idx1[cp >> scale_idx1]; + b = idx2[(a << scale_idx2) + ((cp >> scale_idx2) & 0xf)]; + c = (b << scale_off) + ((cp & 0xf) << scale_data); + if (compat) ++c; + d = offsets[c]; + return &data[d]; +} + +static inline int decompose_hangul( WCHAR ch, WCHAR dum[4], int dstlen ) +{ + static const WCHAR sbase = 0xac00, lbase = 0x1100, vbase = 0x1161, tbase = 0x11a7; + static const WCHAR /*lcount = 19, vcount = 21,*/ tcount = 28, ncount = 588/*, scount = 11172*/; + WCHAR sindex, lindex, vindex, tindex; + if (ch >= 0xac00 && ch <= 0xd7af) + { + sindex = ch - sbase; + lindex = sindex / ncount; + vindex = (sindex % ncount) / tcount; + tindex = sindex % tcount; + dum[0] = lbase + lindex; + dum[1] = vbase + vindex; + dum[2] = (tindex > 0) ? (tbase + tindex) : 0; + dum[3] = 0; + } + else + { + dum[0] = ch; + dum[1] = 0; + } + + return 0; +} + +static inline UINT utf16_codepoint_to_surrogates( UINT cp ) +{ + UINT ch = cp; + + WCHAR hx, hw, lx; + UINT hu; + hx = (WCHAR)cp; + hu = (cp >> 16) & ((1 << 5) - 1); + hw = (WCHAR)hu - 1; + lx = (WCHAR)cp; + ch = 0xD800 | (hw << 6) | (hx >> 10); + ch |= (0xDC00 | (lx & ((1 << 10) - 1)))<<16; + + return ch; +} + +static inline UINT utf16_surrogates_to_codepoint( WCHAR hi, WCHAR lo ) +{ + UINT x, w, u, c; + x = ((hi & ((1 << 6) - 1)) << 10) | (lo & ((1 << 10) - 1)); + w = (hi >> 6) & ((1 << 5) - 1); + u = w + 1; + c = (u << 16) | x; + return c; +} + +static int decompose_char_recursive( int compat, UINT ch, WCHAR *dst, int dstlen ) +{ + const WCHAR *map = NULL; + int size_decomp = 0; + int total_decomp = 0; + + if (ch < 0xa0) /* fast path */ + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + else if (ch >= 0xac00 && ch <= 0xd7af) /* hangul */ + { + WCHAR dum[4]; + int len = 0, i = 0; + + decompose_hangul( ch, dum, dstlen ); + while (dum[i]) + { + if (dstlen-i) dst[i] = dum[i]; + i++; + len++; + } + return len; + } + else if (ch > last_decomposable || + !*(map = unicode_table_lookup( ch, compat, idx1_decomp, 8, + idx2_decomp, 4, offsets_decomp, 5, data_decomp, 1 ))) + { + if (ch > 0xffff) + { + ch = utf16_codepoint_to_surrogates( ch ); + if (dstlen) *dst = (WCHAR)ch; + if (dstlen-1) *(dst+1) = (WCHAR)(ch>>16); + return 2; + } + else + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + } + else { + while (*map) + { + size_decomp = decompose_char_recursive( compat, *map, dst, dstlen ); + dstlen -= size_decomp; + if (dstlen < 0) dstlen = 0; + dst += size_decomp; + map++; + total_decomp += size_decomp; + } + return total_decomp; + } +} + +unsigned int wine_unicode_decompose_string( int compat, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +{ + UINT ch; + int srcpos = 0, dstpos = 0, r; + + if (dstlen < 0) dstlen = 0; + + while (srcpos < srclen) + { + ch = src[srcpos]; + + if (ch >= 0xd800 && ch <= 0xdbff) /* high surrogate */ + { + WCHAR hi, lo; + if (srcpos+1 == srclen) return srcpos; + hi = (WCHAR)ch; + lo = src[++srcpos]; + if (lo < 0xdc00 || lo > 0xdfff) return srcpos; + ch = utf16_surrogates_to_codepoint( hi, lo ); + } + else if (ch >= 0xdc00 && ch <= 0xdfff) /* low surrogate */ + { + return srcpos; + } + + r = decompose_char_recursive( compat, ch, dst+dstpos, dstlen ); + dstpos += r; + + if (dstlen > 0) + { + dstlen -= r; + if (dstlen < 0) + { + while (dstlen < 0) + { + dstpos--; + dstlen++; + } + break; + } + } + + ++srcpos; + } - *dst = ch; - if (!*ptr) return 1; - if (dstlen <= 1) return 0; - /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; - return res; + return dstpos; } diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82d8b..d78bfe81e6 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; +extern unsigned int wine_unicode_decompose_string( int compat, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ); /* check the code whether it is in Unicode Private Use Area (PUA). */ /* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ @@ -107,13 +107,13 @@ static int mbstowcs_sbcs_decompose( const struct sbcs_table *table, int flags, { WCHAR dummy[4]; /* no decomposition is larger than 4 chars */ for (len = 0; srclen; srclen--, src++) - len += wine_decompose( cp2uni[*src], dummy, 4 ); + len += wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dummy, 4 ); return len; } for (len = dstlen; srclen && len; srclen--, src++) { - unsigned int res = wine_decompose( cp2uni[*src], dst, len ); + unsigned int res = wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dst, len ); if (!res) break; len -= res; dst += res; @@ -219,7 +219,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - len += wine_decompose( ch, dummy, 4 ); + len += wine_unicode_decompose_string( 0, &ch, 1, dummy, 4 ); } return len; } @@ -234,7 +234,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - if (!(res = wine_decompose( ch, dst, len ))) break; + if (!(res = wine_unicode_decompose_string( 0, &ch, 1, dst, len ))) break; dst += res; len -= res; } diff --git a/tools/make_unicode b/tools/make_unicode index 92b0b64a94..34938f9786 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -471,6 +471,26 @@ sub READ_DEFAULTS($) next if $decomp eq ""; # no decomposition, skip it + # store decomposition table + if ($decomp =~ /^<([a-zA-Z]+)>(\s+[0-9a-fA-F]+)+$/) + { + my @seq = (); + for my $ch (split /\s+/, (split /\s+/, $decomp, 2)[1]) + { + push @seq, (hex $ch); + } + $decomp_table[$src] = [1, \@seq]; + } + elsif ($decomp =~ /^([0-9a-fA-F]+)(\s+([0-9a-fA-F]+))*$/) + { + my @seq = (); + for my $ch (split /\s+/, $decomp) + { + push @seq, (hex $ch); + } + $decomp_table[$src] = [0, \@seq]; + } + if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) { # decomposition of the form "<foo> 1234" -> use char if type is known @@ -508,7 +528,6 @@ sub READ_DEFAULTS($) # store decomposition if it contains two chars if ($decomp =~ /^([0-9a-fA-F]+)\s+([0-9a-fA-F]+)$/) { - $decomp_table[$src] = [ hex $1, hex $2 ]; push @compose_table, [ hex $1, hex $2, $src ]; } elsif ($decomp =~ /^(<[a-z]+>\s)*([0-9a-fA-F]+)$/ && @@ -2258,6 +2277,51 @@ EOF save_file($filename); } +sub recursive_decomp +{ + my ($char, $table_ref, $compat) = @_; + + return ($char) unless defined $table_ref->[$char]; + my $data = $table_ref->[$char]; + return ($char) if $data->[0] && !$compat; + my @mapping = (); + for my $ch (@{$data->[1]}) + { + push @mapping, recursive_decomp( $ch, $table_ref, $compat ); + } + return @mapping; +} + +sub expand_pairs +{ + my @data = @_; + my @result = (); + + for my $ch (@data) + { + if ($ch <= 0xFFFF) + { + push @result, $ch; + } + elsif ($ch >= 2097152) # 2**21 + { + die sprintf "Invalid Unicode character %04x\n", $ch; + } + else + { + my $hx = $ch & 0xFFFF; + my $hu = ($ch >> 16) & ((1 << 5) - 1); + my $hw = ($hu - 1) & 0xFFFF; + my $hi = 0xD800 | ($hw << 6) | ($hx >> 10); + my $lx = $ch & 0xFFFF; + my $lo = (0xDC00 | ($lx & ((1 << 10) - 1))) & 0xFFFF; + push @result, $hi; + push @result, $lo; + } + } + return @result; +} + ################################################################ # dump the char decomposition table sub dump_decompose_table($) @@ -2266,98 +2330,334 @@ sub dump_decompose_table($) open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; - print OUTPUT "/* Unicode char composition */\n"; + print OUTPUT "/* Unicode char decomposition */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - # first determine all the 16-char subsets that contain something + my $utflim = 2097152; + my %nfd_lookup = (); + my %nfkd_lookup = (); + my %decomp_lookup = (); + my @decomp_data = (0); + my $pos = 1; + my $lastchar_decomp; - my @filled = (0) x 4096; - my $pos = 16*2; # for the null subset - for (my $i = 0; $i < 65536; $i++) + for (my $i = 0; $i < $utflim; $i++) { next unless defined $decomp_table[$i]; - $filled[$i >> 4] = $pos; - $pos += 16*2; - $i |= 15; + + if (defined $decomp_table[$i]) + { + $lastchar_decomp = $i; + # fully expand input and mappings + + my @char = expand_pairs( ($i) ); + push @char, 0; + my $char = pack "n*", @char; + + my @nfd = recursive_decomp( $i, \@decomp_table, 0 ); + @nfd = expand_pairs( @nfd ); + push @nfd, 0; + my $nfd = pack "n*", @nfd; + + my @nfkd = recursive_decomp( $i, \@decomp_table, 1 ); + @nfkd = expand_pairs( @nfkd ); + push @nfkd, 0; + my $nfkd = pack "n*", @nfkd; + + # lookup or add mappings + + if ($nfd eq $char) + { + $nfd = undef; + } + elsif (exists $decomp_lookup{$nfd}) + { + $nfd_lookup{$i} = $decomp_lookup{$nfd}; + } + else + { + push @decomp_data, @nfd; + $decomp_lookup{$nfd} = $pos; + $nfd_lookup{$i} = $pos; + $pos += @nfd; + } + + if ($nfkd eq $char) + { + $nfkd = undef; + } + elsif (exists $decomp_lookup{$nfkd}) + { + $nfkd_lookup{$i} = $decomp_lookup{$nfkd}; + } + else + { + push @decomp_data, @nfkd; + $decomp_lookup{$nfkd} = $pos; + $nfkd_lookup{$i} = $pos; + $pos += @nfkd; + } + } } - my $total = $pos; - # now count the 256-char subsets that contain something + printf OUTPUT "static const UINT last_decomposable = 0x%x;\n\n", $lastchar_decomp; + + # dump decomposition data + + printf OUTPUT "static const WCHAR data_decomp[%d] =\n", $pos; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @decomp_data ); + print OUTPUT "\n};\n\n"; - my @filled_idx = (256) x 256; - $pos = 256 + 16; - for (my $i = 0; $i < 4096; $i++) + # find 256-char subsets that contain something + + my $filled_pos = 1; + my $filled_lim = ($lastchar_decomp >> 8) + 1; + my @filled = (0) x $filled_lim; + for (my $i = 0; $i < $utflim; $i++) { - next unless $filled[$i]; - $filled_idx[$i >> 4] = $pos; - $pos += 16; - $i |= 15; + last if $i > $lastchar_decomp; + next unless exists $nfd_lookup{$i} || exists $nfkd_lookup{$i}; + $filled[$i >> 8] = $filled_pos++; + $i |= 255; } - my $null_offset = $pos; # null mapping - $total += $pos; - # add the index offsets to the subsets positions + # dump index of 256-char subsets + + printf OUTPUT "static const BYTE idx1_decomp[%d] =\n", $filled_lim; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%02x", 0, @filled ); + print OUTPUT "\n};\n\n"; + + # for 256-char subsets, find non-empty 16-char subsets - for (my $i = 0; $i < 4096; $i++) + my $sub_filled_pos = 1; + my %sub_filled = (); + for (my $i = 0; $i < $filled_lim; $i++) { next unless $filled[$i]; - $filled[$i] += $null_offset; + for (my $j = 0; $j < 256; $j++) + { + my $idx = ($i << 8) | $j; + next unless exists $nfd_lookup{$idx} || exists $nfkd_lookup{$idx}; + $sub_filled{$idx >> 4} = $sub_filled_pos++; + $j |= 15; + } } - # dump the main index + # dump index of 16-char subsets - printf OUTPUT "static const WCHAR table[%d] =\n", $total; - printf OUTPUT "{\n /* index */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @filled_idx ); - printf OUTPUT ",\n /* null sub-index */\n%s", DUMP_ARRAY( "0x%04x", 0, ($null_offset) x 16 ); - - # dump the second-level indexes - - for (my $i = 0; $i < 256; $i++) + printf OUTPUT "static const USHORT idx2_decomp[%d] =\n", $filled_pos * 16; + print OUTPUT "{\n"; + my @null_idx = (0) x 16; + print OUTPUT " /* null sub-index */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_idx ); + for (my $i = 0; $i < $filled_lim; $i++) { - next unless ($filled_idx[$i] > 256); - my @table = @filled[($i<<4)..($i<<4)+15]; - for (my $j = 0; $j < 16; $j++) { $table[$j] ||= $null_offset; } - printf OUTPUT ",\n /* sub-index %02x */\n", $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + next unless $filled[$i]; + printf OUTPUT ",\n /* sub-index 0x%02x */\n", $filled[$i]; + + my @sub_idx; + for (my $j = 0; $j < 16; $j++) + { + my $idx = ($i << 4) | $j; + $sub_idx[$j] = $sub_filled{$idx} || 0; + } + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_idx ); } + print OUTPUT "\n};\n\n"; # dump the 16-char subsets - printf OUTPUT ",\n /* null mapping */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, (0) x 32 ); - - for (my $i = 0; $i < 4096; $i++) + printf OUTPUT "static const USHORT offsets_decomp[%d] =\n", 32 * $sub_filled_pos; + print OUTPUT "{\n"; + print OUTPUT " /* (nfd, nfkd) x 16 */\n"; + my @null_table = (0) x 32; + print OUTPUT " /* no decomposition */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_table ); + for my $key (sort {$a <=> $b} keys %sub_filled) { - next unless $filled[$i]; - my @table = (0) x 32; + printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $key, $key; + my @sub_table; for (my $j = 0; $j < 16; $j++) { - if (defined $decomp_table[($i<<4) + $j]) - { - $table[2 * $j] = ${$decomp_table[($i << 4) + $j]}[0]; - $table[2 * $j + 1] = ${$decomp_table[($i << 4) + $j]}[1]; - } + my $idx = ($key << 4) | $j; + $sub_table[2 * $j] = $nfd_lookup{$idx} || 0; + $sub_table[2 * $j + 1] = $nfkd_lookup{$idx} || 0; } - printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $i, $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_table ); } + print OUTPUT "\n};\n\n"; - printf OUTPUT "\n};\n\n"; print OUTPUT <<"EOF"; -unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +static const WCHAR *unicode_table_lookup( UINT cp, int compat, const BYTE *idx1, UINT scale_idx1, + const USHORT *idx2, UINT scale_idx2, const USHORT *offsets, + UINT scale_off, const WCHAR *data, UINT scale_data ) { - const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - unsigned int res; + USHORT a, b, c, d; + a = idx1[cp >> scale_idx1]; + b = idx2[(a << scale_idx2) + ((cp >> scale_idx2) & 0xf)]; + c = (b << scale_off) + ((cp & 0xf) << scale_data); + if (compat) ++c; + d = offsets[c]; + return &data[d]; +} - *dst = ch; - if (!*ptr) return 1; - if (dstlen <= 1) return 0; - /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; - return res; +static inline int decompose_hangul( WCHAR ch, WCHAR dum[4], int dstlen ) +{ + static const WCHAR sbase = 0xac00, lbase = 0x1100, vbase = 0x1161, tbase = 0x11a7; + static const WCHAR /*lcount = 19, vcount = 21,*/ tcount = 28, ncount = 588/*, scount = 11172*/; + WCHAR sindex, lindex, vindex, tindex; + if (ch >= 0xac00 && ch <= 0xd7af) + { + sindex = ch - sbase; + lindex = sindex / ncount; + vindex = (sindex % ncount) / tcount; + tindex = sindex % tcount; + dum[0] = lbase + lindex; + dum[1] = vbase + vindex; + dum[2] = (tindex > 0) ? (tbase + tindex) : 0; + dum[3] = 0; + } + else + { + dum[0] = ch; + dum[1] = 0; + } + + return 0; +} + +static inline UINT utf16_codepoint_to_surrogates( UINT cp ) +{ + UINT ch = cp; + + WCHAR hx, hw, lx; + UINT hu; + hx = (WCHAR)cp; + hu = (cp >> 16) & ((1 << 5) - 1); + hw = (WCHAR)hu - 1; + lx = (WCHAR)cp; + ch = 0xD800 | (hw << 6) | (hx >> 10); + ch |= (0xDC00 | (lx & ((1 << 10) - 1)))<<16; + + return ch; +} + +static inline UINT utf16_surrogates_to_codepoint( WCHAR hi, WCHAR lo ) +{ + UINT x, w, u, c; + x = ((hi & ((1 << 6) - 1)) << 10) | (lo & ((1 << 10) - 1)); + w = (hi >> 6) & ((1 << 5) - 1); + u = w + 1; + c = (u << 16) | x; + return c; +} + +static int decompose_char_recursive( int compat, UINT ch, WCHAR *dst, int dstlen ) +{ + const WCHAR *map = NULL; + int size_decomp = 0; + int total_decomp = 0; + + if (ch < 0xa0) /* fast path */ + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + else if (ch >= 0xac00 && ch <= 0xd7af) /* hangul */ + { + WCHAR dum[4]; + int len = 0, i = 0; + + decompose_hangul( ch, dum, dstlen ); + while (dum[i]) + { + if (dstlen-i) dst[i] = dum[i]; + i++; + len++; + } + return len; + } + else if (ch > last_decomposable || + !*(map = unicode_table_lookup( ch, compat, idx1_decomp, 8, + idx2_decomp, 4, offsets_decomp, 5, data_decomp, 1 ))) + { + if (ch > 0xffff) + { + ch = utf16_codepoint_to_surrogates( ch ); + if (dstlen) *dst = (WCHAR)ch; + if (dstlen-1) *(dst+1) = (WCHAR)(ch>>16); + return 2; + } + else + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + } + else { + while (*map) + { + size_decomp = decompose_char_recursive( compat, *map, dst, dstlen ); + dstlen -= size_decomp; + if (dstlen < 0) dstlen = 0; + dst += size_decomp; + map++; + total_decomp += size_decomp; + } + return total_decomp; + } +} + +unsigned int wine_unicode_decompose_string( int compat, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +{ + UINT ch; + int srcpos = 0, dstpos = 0, r; + + if (dstlen < 0) dstlen = 0; + + while (srcpos < srclen) + { + ch = src[srcpos]; + + if (ch >= 0xd800 && ch <= 0xdbff) /* high surrogate */ + { + WCHAR hi, lo; + if (srcpos+1 == srclen) return srcpos; + hi = (WCHAR)ch; + lo = src[++srcpos]; + if (lo < 0xdc00 || lo > 0xdfff) return srcpos; + ch = utf16_surrogates_to_codepoint( hi, lo ); + } + else if (ch >= 0xdc00 && ch <= 0xdfff) /* low surrogate */ + { + return srcpos; + } + + r = decompose_char_recursive( compat, ch, dst+dstpos, dstlen ); + dstpos += r; + + if (dstlen > 0) + { + dstlen -= r; + if (dstlen < 0) + { + while (dstlen < 0) + { + dstpos--; + dstlen++; + } + break; + } + } + + ++srcpos; + } + + return dstpos; } EOF close OUTPUT; -- 2.14.1

1 2

[PATCH] user32: fix stale sysfont values upon locale switch
by Rafał Mużyło 24 Mar '18

24 Mar '18

If a prefix is created in one locale, then a program is run in it in a different locale, most locale-dependent font settings are already reset, yet there are a few values that aren't, namely those stored in 'HKEY_CURRENT_USER\Control Panel\Desktop\WindowMetrics' *Font keys. This might mess up different things, as one of the fields stores charset, which is a base for certain MultiByteToWideChar conversions. This is the cleanest solution I could come up with. Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl>

1 0

[PATCH] treeview: Use lstrcmpW instead of pointer comparison
by Dan Bassi 24 Mar '18

24 Mar '18

2 1

kernel32: Rename Czech Republic to Czechia
by André Hentschel 24 Mar '18

24 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/nls/csy.nls | 4 ++-- dlls/msvcrt/tests/locale.c | 6 ++++-- loader/wine.inf.in | 2 +- tools/wmc/lang.c | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c5eeabf..73f7a6f 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4927,7 +4927,7 @@ static const struct geoinfo_t geoinfodata[] = { { 71, {'E','R',0}, {'E','R','I',0}, 47603, 232 }, /* Eritrea */ { 72, {'S','V',0}, {'S','L','V',0}, 27082, 222 }, /* El Salvador */ { 73, {'E','T',0}, {'E','T','H',0}, 47603, 231 }, /* Ethiopia */ - { 75, {'C','Z',0}, {'C','Z','E',0}, 47609, 203 }, /* Czech Republic */ + { 75, {'C','Z',0}, {'C','Z','E',0}, 47609, 203 }, /* Czechia */ { 77, {'F','I',0}, {'F','I','N',0}, 10039882, 246 }, /* Finland */ { 78, {'F','J',0}, {'F','J','I',0}, 20900, 242 }, /* Fiji Islands */ { 80, {'F','M',0}, {'F','S','M',0}, 21206, 583 }, /* Micronesia */ diff --git a/dlls/kernel32/nls/csy.nls b/dlls/kernel32/nls/csy.nls index 7d7aa0e..8d9178d 100644 --- a/dlls/kernel32/nls/csy.nls +++ b/dlls/kernel32/nls/csy.nls @@ -86,7 +86,7 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME11 "XI" LOCALE_SABBREVMONTHNAME12 "XII" LOCALE_SABBREVMONTHNAME13 "" - LOCALE_SCOUNTRY "Czech Republic" + LOCALE_SCOUNTRY "Czechia" LOCALE_SCURRENCY "Kč" LOCALE_SDATE "." LOCALE_SDAYNAME1 "pondělí" @@ -97,7 +97,7 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LOCALE_SDAYNAME6 "sobota" LOCALE_SDAYNAME7 "neděle" LOCALE_SDECIMAL "," - LOCALE_SENGCOUNTRY "Czech Republic" + LOCALE_SENGCOUNTRY "Czechia" LOCALE_SENGCURRNAME "Czech Koruna" LOCALE_SENGLANGUAGE "Czech" LOCALE_SGROUPING "3;0" diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index f87a791..949068a 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -158,12 +158,14 @@ todo_wine ret = setlocale(LC_ALL, "csy"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Czech_Czech Republic.1250"), "ret = %s\n", ret); + ok(!strcmp(ret, "Czech_Czechia.1250") + || broken(!strcmp(ret, "Czech_Czech Republic.1250")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "czech"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Czech_Czech Republic.1250"), "ret = %s\n", ret); + ok(!strcmp(ret, "Czech_Czechia.1250") + || broken(!strcmp(ret, "Czech_Czech Republic.1250")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "dan"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3c55125..1249bb2 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -1774,7 +1774,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\41,"SameAreaRule",,"G" HKLM,%CurrentVersion%\Telephony\Country List\420,"CountryCode",0x10001,0x000001a4 HKLM,%CurrentVersion%\Telephony\Country List\420,"InternationalRule",,"00EFG" HKLM,%CurrentVersion%\Telephony\Country List\420,"LongDistanceRule",,"0FG" -HKLM,%CurrentVersion%\Telephony\Country List\420,"Name",,"Czech Republic" +HKLM,%CurrentVersion%\Telephony\Country List\420,"Name",,"Czechia" HKLM,%CurrentVersion%\Telephony\Country List\420,"SameAreaRule",,"G" HKLM,%CurrentVersion%\Telephony\Country List\421,"CountryCode",0x10001,0x000001a5 diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index b045612..76ddfdd 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -76,7 +76,7 @@ static const language_t languages[] = { {0x003E, 850, 1252, "Malay", NULL}, {0x0402, 866, 1251, "Bulgarian", "Bulgaria"}, {0x0403, 850, 1252, "Catalan", "Spain"}, - {0x0405, 852, 1250, "Czech", "Czech Republic"}, + {0x0405, 852, 1250, "Czech", "Czechia"}, {0x0406, 850, 1252, "Danish", "Denmark"}, {0x0407, 850, 1252, "German", "Germany"}, {0x0408, 737, 1253, "Greek", "Greece"}, -- 2.7.4

2 1

GSOC 2018: NEED TO CONTACT MENTOR: ALEX HENRIE
by Adeniyi Mayokun 24 Mar '18

24 Mar '18

Good Day, i am Adeniyi Mayokun and I would love to contact Mentor Alex Henrie in respect to GSOC 2018 project :implement a calculator app.

2 1

[PATCH 2/2] Fixed wrc gives parse error if resource nameID has quoted & Updated parse.l file
by Adeniyi Mayokun 24 Mar '18

24 Mar '18

>From e40c908b95aff31a5527abbd0690cc61f5f50bd4 Mon Sep 17 00:00:00 2001 From: Adeniyi Mayokun <adeniyimayokun17(a)gmail.com> Date: Sat, 24 Mar 2018 11:07:17 +0100 Subject: [PATCH 2/2] Fixed wrc gives parse error if resource nameID has quoted & Updated parse.l file Signed-off-by: Adeniyi Mayokun <adeniyimayokun17(a)gmail.com> --- tools/wrc/parser.l | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 32a231b5a2..dfcefc069e 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -66,7 +66,10 @@ * - Rebuild string processing so that it may contain * escaped '\0'. */ - +/* Exclusive double-quoted nameID handling */ +%x tkid_dbl +/* Exclusive single-quoted nameID handling */ +%x tkid_sgl /* Exclusive string handling */ %x tkstr /* Exclusive unicode string handling */ @@ -122,6 +125,7 @@ ws [ \f\t\r] #define YY_USER_ACTION char_number+=yyleng; wanted_id = want_id; want_id = 0; #define YY_USER_INIT current_codepage = -1; +id_initial = 1; static void addcchar(char c); static void addwchar(WCHAR s); @@ -138,6 +142,13 @@ static int wbufalloc = 0; static int current_codepage = -1; /* use language default */ +/* Used for differentiating between single- and double-quoted nameID's */ +static int id_dblquote = 0; +/* Used for catching first (quoted) nameID before wanted_id is set. + * This variable is reset to 0 once the first ID (quoted or not), string or + * data has been encountered */ +static int id_initial = 1; + /* * This one is a bit tricky. * We set 'want_id' in the parser to get the first @@ -402,8 +413,46 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) 0[oO][0-7]+[lL]? { parser_lval.num = xstrtoul(yytext+2, 0, 8); return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; } +<tkid_dbl>{A-Za-z_0-9./\\\']+\" +| +<tkid_sgl>[A-Za-z_0-9./\\\"]+\' +{ + +char *tmp; + +size_t len; + +/* Plus 1 for the initial double quote that we missed and plus 1 for a trailing NUL */ + +len = strlen(yytext) +2; + +tmp = xmalloc(len); + +/* Put the quote character that was missed */ + +tmp[0] = id_dblquote ? '\"' : '\''; + +id_dlquote = 0; + +strcpy(tmp + 1, yytext); + +/* Make sure we have a NUL at the end */ + +tmp[len-1] = '\0'; + +parser_lval.str = make_string(tmp); + +free(tmp); + +yy_pop_state(); + +return tIDENT; +} + + [A-Za-z_0-9./\\]+ { struct keyword *tok = iskeyword(yytext); + id_initial = 0; if(tok) { @@ -427,6 +476,9 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) */ L\" { yy_push_state(tklstr); + + id_initial = 0; + wbufidx = 0; if(!win32) parser_warning("16bit resource contains unicode strings\n"); @@ -483,7 +535,29 @@ L\" { /* * Normal string scanning */ -\" yy_push_state(tkstr); cbufidx = 0; +\" { + + +if (wanted_id || id_initial) + +{ + +yy_push_state(tkid_dbl); + +id_dblquote = 1; + +id_initial = 0; + +} + +else + +{ + + yy_push_state(tkstr); cbufidx = 0; + +} + } <tkstr>\"{ws}+ | <tkstr>\" { yy_pop_state(); @@ -528,7 +602,29 @@ L\" { /* * Raw data scanning */ -\' yy_push_state(tkrcd); cbufidx = 0; +\' { + +if (wanted_id || id_initial) + +{ + +yy_push_state(tkid_sgl); + +id_initial = 0; + +id_dblquote = 0; + +} + +else + +{ + + + yy_push_state(tkrcd); cbufidx = 0; + +} + } <tkrcd>\' { yy_pop_state(); parser_lval.raw = new_raw_data(); -- 2.14.1

2 1

[PATCH] include: Add WinInet error codes
by Nikolay Sivov 24 Mar '18

24 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/winerror.h | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index 2c6ce20b3d..886182ff3d 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3010,6 +3010,85 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define SCARD_W_CACHE_ITEM_STALE _HRESULT_TYPEDEF_(0x80100071) #define SCARD_W_CACHE_ITEM_TOO_BIG _HRESULT_TYPEDEF_(0x80100072) +#define WININET_E_OUT_OF_HANDLES _HRESULT_TYPEDEF_(0x80072ee1) +#define WININET_E_TIMEOUT _HRESULT_TYPEDEF_(0x80072ee2) +#define WININET_E_EXTENDED_ERROR _HRESULT_TYPEDEF_(0x80072ee3) +#define WININET_E_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x80072ee4) +#define WININET_E_INVALID_URL _HRESULT_TYPEDEF_(0x80072ee5) +#define WININET_E_UNRECOGNIZED_SCHEME _HRESULT_TYPEDEF_(0x80072ee6) +#define WININET_E_NAME_NOT_RESOLVED _HRESULT_TYPEDEF_(0x80072ee7) +#define WININET_E_PROTOCOL_NOT_FOUND _HRESULT_TYPEDEF_(0x80072ee8) +#define WININET_E_INVALID_OPTION _HRESULT_TYPEDEF_(0x80072ee9) +#define WININET_E_BAD_OPTION_LENGTH _HRESULT_TYPEDEF_(0x80072eea) +#define WININET_E_OPTION_NOT_SETTABLE _HRESULT_TYPEDEF_(0x80072eeb) +#define WININET_E_SHUTDOWN _HRESULT_TYPEDEF_(0x80072eec) +#define WININET_E_INCORRECT_USER_NAME _HRESULT_TYPEDEF_(0x80072eed) +#define WININET_E_INCORRECT_PASSWORD _HRESULT_TYPEDEF_(0x80072eee) +#define WININET_E_LOGIN_FAILURE _HRESULT_TYPEDEF_(0x80072eef) +#define WININET_E_INVALID_OPERATION _HRESULT_TYPEDEF_(0x80072ef0) +#define WININET_E_OPERATION_CANCELLED _HRESULT_TYPEDEF_(0x80072ef1) +#define WININET_E_INCORRECT_HANDLE_TYPE _HRESULT_TYPEDEF_(0x80072ef2) +#define WININET_E_INCORRECT_HANDLE_STATE _HRESULT_TYPEDEF_(0x80072ef3) +#define WININET_E_NOT_PROXY_REQUEST _HRESULT_TYPEDEF_(0x80072ef4) +#define WININET_E_REGISTRY_VALUE_NOT_FOUND _HRESULT_TYPEDEF_(0x80072ef5) +#define WININET_E_BAD_REGISTRY_PARAMETER _HRESULT_TYPEDEF_(0x80072ef6) +#define WININET_E_NO_DIRECT_ACCESS _HRESULT_TYPEDEF_(0x80072ef7) +#define WININET_E_NO_CONTEXT _HRESULT_TYPEDEF_(0x80072ef8) +#define WININET_E_NO_CALLBACK _HRESULT_TYPEDEF_(0x80072ef9) +#define WININET_E_REQUEST_PENDING _HRESULT_TYPEDEF_(0x80072efa) +#define WININET_E_INCORRECT_FORMAT _HRESULT_TYPEDEF_(0x80072efb) +#define WININET_E_ITEM_NOT_FOUND _HRESULT_TYPEDEF_(0x80072efc) +#define WININET_E_CANNOT_CONNECT _HRESULT_TYPEDEF_(0x80072efd) +#define WININET_E_CONNECTION_ABORTED _HRESULT_TYPEDEF_(0x80072efe) +#define WININET_E_CONNECTION_RESET _HRESULT_TYPEDEF_(0x80072eff) +#define WININET_E_FORCE_RETRY _HRESULT_TYPEDEF_(0x80072f00) +#define WININET_E_INVALID_PROXY_REQUREST _HRESULT_TYPEDEF_(0x80072f01) +#define WININET_E_NEED_UI _HRESULT_TYPEDEF_(0x80072f02) +#define WININET_E_HANDLE_EXISTS _HRESULT_TYPEDEF_(0x80072f04) +#define WININET_E_SEC_CERT_DATE_INVALID _HRESULT_TYPEDEF_(0x80072f05) +#define WININET_E_SEC_CERT_CN_INVALID _HRESULT_TYPEDEF_(0x80072f06) +#define WININET_E_HTTP_TO_HTTPS_ON_REDIR _HRESULT_TYPEDEF_(0x80072f07) +#define WININET_E_HTTPS_TO_HTTP_ON_REDIR _HRESULT_TYPEDEF_(0x80072f08) +#define WININET_E_MIXED_SECURITY _HRESULT_TYPEDEF_(0x80072f09) +#define WININET_E_CHG_POST_IS_NON_SECURE _HRESULT_TYPEDEF_(0x80072f0a) +#define WININET_E_POST_IS_NON_SECURE _HRESULT_TYPEDEF_(0x80072f0b) +#define WININET_E_CLIENT_AUTH_CERT_NEEDED _HRESULT_TYPEDEF_(0x80072f0c) +#define WININET_E_INVALID_CA _HRESULT_TYPEDEF_(0x80072f0d) +#define WININET_E_CLIENT_AUTH_NOT_SETUP _HRESULT_TYPEDEF_(0x80072f0e) +#define WININET_E_ASYNC_THREAD_FAILED _HRESULT_TYPEDEF_(0x80072f0f) +#define WININET_E_REDIRECT_SCHEME_CHANGE _HRESULT_TYPEDEF_(0x80072f10) +#define WININET_E_DIALOG_PENDING _HRESULT_TYPEDEF_(0x80072f11) +#define WININET_E_RETRY_DIALOG _HRESULT_TYPEDEF_(0x80072f12) +#define WININET_E_NO_NEW_CONTAINERS _HRESULT_TYPEDEF_(0x80072f13) +#define WININET_E_HTTPS_HTTP_SUBMIT_REDIR _HRESULT_TYPEDEF_(0x80072f14) +#define WININET_E_SEC_CERT_ERRORS _HRESULT_TYPEDEF_(0x80072f17) +#define WININET_E_SEC_CERT_REV_FAILED _HRESULT_TYPEDEF_(0x80072f19) +#define WININET_E_HEADER_NOT_FOUND _HRESULT_TYPEDEF_(0x80072f76) +#define WININET_E_DOWNLEVEL_SERVER _HRESULT_TYPEDEF_(0x80072f77) +#define WININET_E_INVALID_SERVER_RESPONSE _HRESULT_TYPEDEF_(0x80072f78) +#define WININET_E_INVALID_HEADER _HRESULT_TYPEDEF_(0x80072f79) +#define WININET_E_INVALID_QUERY_REQUEST _HRESULT_TYPEDEF_(0x80072f7a) +#define WININET_E_HEADER_ALREADY_EXISTS _HRESULT_TYPEDEF_(0x80072f7b) +#define WININET_E_REDIRECT_FAILED _HRESULT_TYPEDEF_(0x80072f7c) +#define WININET_E_SECURITY_CHANNEL_ERROR _HRESULT_TYPEDEF_(0x80072f7d) +#define WININET_E_UNABLE_TO_CACHE_FILE _HRESULT_TYPEDEF_(0x80072f7e) +#define WININET_E_TCPIP_NOT_INSTALLED _HRESULT_TYPEDEF_(0x80072f7f) +#define WININET_E_NOT_REDIRECTED _HRESULT_TYPEDEF_(0x80072f80) +#define WININET_E_COOKIE_NEEDS_CONFIRMATION _HRESULT_TYPEDEF_(0x80072f81) +#define WININET_E_COOKIE_DECLINED _HRESULT_TYPEDEF_(0x80072f82) +#define WININET_E_DISCONNECTED _HRESULT_TYPEDEF_(0x80072f83) +#define WININET_E_SERVER_UNREACHABLE _HRESULT_TYPEDEF_(0x80072f84) +#define WININET_E_PROXY_SERVER_UNREACHABLE _HRESULT_TYPEDEF_(0x80072f85) +#define WININET_E_BAD_AUTO_PROXY_SCRIPT _HRESULT_TYPEDEF_(0x80072f86) +#define WININET_E_UNABLE_TO_DOWNLOAD_SCRIPT _HRESULT_TYPEDEF_(0x80072f87) +#define WININET_E_REDIRECT_NEEDS_CONFIRMATION _HRESULT_TYPEDEF_(0x80072f88) +#define WININET_E_SEC_INVALID_CERT _HRESULT_TYPEDEF_(0x80072f89) +#define WININET_E_SEC_CERT_REVOKED _HRESULT_TYPEDEF_(0x80072f8a) +#define WININET_E_FAILED_DUETOSECURITYCHECK _HRESULT_TYPEDEF_(0x80072f8b) +#define WININET_E_NOT_INITIALIZED _HRESULT_TYPEDEF_(0x80072f8c) +#define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) +#define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003) -- 2.16.2

1 0

Re: Student preparing for GSoC
by Kieran Duggan 24 Mar '18

24 Mar '18

I think the output I attached was misleading. Really I'm just not understanding the output that I'm getting from valgrind. Namely is seems like the memory leaks are happening outside of wine. Should I even care if a memory leak happens in libfontconfig? Does a memory leak there imply that there is an error in Wine? Also now that I'm playing with it more, I'm not even sure if valgrind is actually testing anything. I'll attach the log in case anyone can point me in the right direction On Wed, Mar 21, 2018 at 9:10 PM, Josh DuBois <duboisj(a)codeweavers.com> wrote: > Hi Kieran, > > Someone else on the list is likely to be better help, but in case you're > in a hurry and don't get a quick response: it looks to me like > libfontconfig lacks debug symbols (which makes sense, as I'd not expect > your copy in /usr/lib to have those). Do you have debug symbols for the > wine functions (and if not, are you sure your wine object files include > them)? > > I don't use Valgrind often, but I would guess you might be able to 1.) > build fontconfig yourself, with debug symbols; and then 2.) cause wine to > use your debug version instead of the system one by setting LD_LIBRARY_PATH > or somesuch. However, I'd also expect that the traces you most want to see > are those from wine. > Again, a wine hacker and more regular Valgrind user from the list may > easily have better advice. > > On 3/21/18 7:27 PM, Kieran Duggan wrote: > > So I'm trying to run the tests with valgrind to find memory leaks but when > I use valgrind I end up getting output looking something like this > ==14135== 288 (256 direct, 32 indirect) bytes in 1 blocks are definitely > lost in loss record 166 of 278 > ==14135== at 0x442EB8F: malloc (in /usr/lib/valgrind/vgpreload_ > memcheck-amd64-linux.so) > ==14135== by 0x96B50B9: ??? (in /usr/lib/x86_64-linux-gnu/ > libfontconfig.so.1.9.0) > ==14135== by 0x96B5829: ??? (in /usr/lib/x86_64-linux-gnu/ > libfontconfig.so.1.9.0) > ==14135== by 0x96B6D4A: ??? (in /usr/lib/x86_64-linux-gnu/ > libfontconfig.so.1.9.0) > ==14135== by 0x96BC19B: ??? (in /usr/lib/x86_64-linux-gnu/ > libfontconfig.so.1.9.0) > ==14135== by 0x98E3A9B: ??? (in /lib/x86_64-linux-gnu/ > libexpat.so.1.6.0) > > but this isn't nearly as useful as the output I see on bugzilla, which > includes function calls and such > I tried recompiling my build with valgrind installed on my computer > and checked to be sure that the make config was detected it with > grep VALGRIND include/config.h and I get > > #define HAVE_VALGRIND_MEMCHECK_H 1 > #define HAVE_VALGRIND_VALGRIND_H 1 > > so I don't think that is the problem. > > It seems to me like valgrind is expecting there to be some flags or > something for it to find but they aren't there. > Can anyone offer some assistance? > > On Mon, Mar 19, 2018 at 5:51 AM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > >> On 19 March 2018 at 10:01, Kieran Duggan <kieranduggan15(a)gmail.com> >> wrote: >> > Yes that is very useful! >> > I took a look at the first one I saw on the list. It goes: >> > >> > ==3551== 8 bytes in 1 blocks are definitely lost in loss record 63 of >> 766 >> > ==3551== at 0x7BC51061: notify_alloc (heap.c:254) >> > ==3551== by 0x7BC5554F: RtlAllocateHeap (heap.c:1716) >> > ==3551== by 0x5C85281: XAudio2Create (xaudio_dll.c:2159) >> > ==3551== by 0x4A1B741: func_xaudio2 (xaudio2.c:1150) >> > ==3551== by 0x4A1C74F: run_test (test.h:603) >> > ==3551== by 0x4A1CBAD: main (test.h:687) >> > ==3551== >> > >> > To fix it I looked at the XAudio2Create function and noticed that >> > IClassFactory *cf was assigned in the call >> > make_xaudio2_factory(&IID_IClassFactory, (void**)&cf); >> > which contains >> > struct xaudio2_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct >> > xaudio2_cf)); >> > >> > Later in the code IClassFactory_Release(cf); is used, but this wouldn't >> free >> > up the space on the heap because of how that function is implemented. >> > >> I believe it does. Commit 45babd780f586eb8d0a93205d0998d6ce3f8396d >> (which was committed after the bug report), changed >> make_xaudio2_factory() to no longer return class factories with a zero >> reference count. That happens sometimes. >> >> Unfortunately, looking over the first couple of entries in the list, >> it seems likely most of them are similarly already fixed. If you have >> the time and inclination it would certainly be useful to go over that >> list to figure out which ones are already fixed and which ones aren't, >> but that would make this a bit more of a challenge than I had >> intended. Sorry about that. >> >> Still, bugzilla is not a bad place to look for things to fix. The >> "download" keyword should limit searches to bugs that can be >> reproduced with free downloads. We also have various small cleanup >> tasks like e.g. replacing HeapAlloc() usage with the heap_alloc() >> helper, or introducing usage of the ARRAY_SIZE macro. The "patches" >> page [1] and git log may have other examples. >> >> [1] https://source.winehq.org/patches/ >> > > > > >

3 9

[PATCH] kernel32: Add forward slash path handling to GetVolumePathNameW.
by Mark White 24 Mar '18

24 Mar '18

From: Mark White <chopinbig2(a)gmail.com> Fixes https://bugs.winehq.org/show_bug.cgi?id=42446 GetVolumePathNameW is causing some incompatibity problems with some Windows applications such as Native Instruments "Native Access" because of an inability to handle path names containing forward slash's whereas the Windows GetVolumePathName's behaviour handles path names with both forward and back slash's. Tested on Debian Stretch and Windows Vista Signed-off-by: Mark White <chopinbig2(a)gmail.com> --- dlls/kernel32/tests/volume.c | 4 ++++ dlls/kernel32/volume.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 365e38c444..c47043d288 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -772,6 +772,10 @@ static void test_GetVolumePathNameA(void) "s:omefile", "S:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_FILE_NOT_FOUND, NO_ERROR }, + { /* test 42: a reasonable forward slash path that is guaranteed to exist */ + "C:/windows/system32", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, }; BOOL ret, success; DWORD error; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index b4163f02eb..ac887b2f3f 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1670,6 +1670,7 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu WCHAR fallbackpathW[] = { 'C',':','\\',0 }; NTSTATUS status = STATUS_SUCCESS; WCHAR *volumenameW = NULL, *c; + WCHAR *fwdslash; int pos, last_pos, stop_pos; UNICODE_STRING nt_name; ANSI_STRING unix_name; @@ -1693,6 +1694,8 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu return FALSE; } strcpyW( volumenameW, filename ); + /* forward slash backslash replace */ + for (fwdslash = volumenameW; *fwdslash; fwdslash++) if (*fwdslash == '/') *fwdslash = '\\'; stop_pos = 0; /* stop searching slashes early for NT-type and nearly NT-type paths */ if (strncmpW(ntprefixW, filename, strlenW(ntprefixW)) == 0) -- 2.11.0

1 0

[PATCH 2/2] Test for explorer.exe with Bugs fixed
by Carlos Vega García 24 Mar '18

24 Mar '18

--- programs/explorer/tests/explorer.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c index 28e1ad3..032ef6f 100755 --- a/programs/explorer/tests/explorer.c +++ b/programs/explorer/tests/explorer.c @@ -132,8 +132,13 @@ int explorer_available(void) STARTUPINFOA si; PROCESS_INFORMATION pi; LPDWORD lpExitCode; +<<<<<<< HEAD char cmd[] = {'e','x','p','l','o','r','e','r',' ','/','r','o','o','t',0}; char windowName[] = {'r','o','o','t',0}; +======= + char cmd[] = {'e','x','p','l','o','r','e','r',' ','C',':',92,'w','i','n','d','o','w','s',0}; + char windowName[] = {'w','i','n','d','o','w','s',0}; +>>>>>>> b2b5eab... Test for explorer with Bugs fixed memset(&si, 0, sizeof(si)); si.cb = sizeof(si); -- 2.7.4

3 2

[PATCH 1/2] explorer.c: Test for explorer.exe (try 2)
by Carlos Vega García 24 Mar '18

24 Mar '18

Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> --- programs/explorer/tests/explorer.c | 180 +++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 programs/explorer/tests/explorer.c diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c new file mode 100644 index 0000000..d195486 --- /dev/null +++ b/programs/explorer/tests/explorer.c @@ -0,0 +1,180 @@ +/* + * Unit tests for explorer.exe + * + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "dde.h" +#include "ddeml.h" +#include "shlobj.h" +#include "wine/test.h" +#include "winuser.h" +#include <stdio.h> +#include <winbase.h> + +/* We test the explorer.exe. This will be the base for start making other tests + * for future + * funtionalities for the explorer (drag&drop). + * + * Tests already implemented: + * - BOOL explorer_available() + */ + +static BOOL use_common(void) +{ + HMODULE hmod; + static BOOL(WINAPI * pIsNTAdmin)(DWORD, LPDWORD); + + /* IsNTAdmin() is available on all platforms. */ + hmod = LoadLibraryA("advpack.dll"); + pIsNTAdmin = (void *)GetProcAddress(hmod, "IsNTAdmin"); + + if (!pIsNTAdmin(0, NULL)) + { + /* We are definitely not an administrator */ + FreeLibrary(hmod); + return FALSE; + } + FreeLibrary(hmod); + + return TRUE; +} + +static BOOL full_title(void) +{ + CABINETSTATE cs; + + memset(&cs, 0, sizeof(cs)); + ReadCabinetState(&cs, sizeof(cs)); + + return (cs.fFullPathTitle == -1); +} + +static char ProgramsDir[MAX_PATH]; +static void init_strings(void) +{ + char commonprograms[MAX_PATH]; + char programs[MAX_PATH]; + + SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); + + /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before + * Vista + * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) + * or + * not (CSIDL_PROGRAMS). + */ + + if (use_common()) + lstrcpyA(ProgramsDir, commonprograms); + else + lstrcpyA(ProgramsDir, programs); +} + +static BOOL check_window_exists(const char *name) +{ + char title[MAX_PATH]; + HWND window = NULL; + int i; + + if (full_title()) + { + strcpy(title, ProgramsDir); + strcat(title, "\\"); + strcat(title, name); + } + else + + strcpy(title, name); + trace("\n \n Window name: %s \n \n", name); + + /* In the next lines we want to ceck if te specified windows has created. We + * don't know exactly how long it will + * take to open the window so we use a loop and sleep function to wait until + * the window opens. + */ + for (i = 0; i < 10; i++) + { + Sleep(20 + 20 * i); + if ((window = FindWindowA("ExplorerWClass", title)) + || (window = FindWindowA("CabinetWClass", title))) + { + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; + } + } + + return (window != NULL); +} + +/* +*We make a call to open a new explorer window and we test if it finally opens. +*I test two window name because in some Windows versions when I open the explorer it creates +*the window with another header. +*/ +BOOL explorer_available(void) +{ + STARTUPINFOA si; + PROCESS_INFORMATION pi; + BOOL is_window_created; + + char cmd[] = {'e', 'x', 'p', 'l', 'o', 'r', 'e', 'r', ' ', 'C', + ':', 92, 'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + char window_name[] = {'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + char window_name_alternative[] = {'C',':',92,'W', 'I', 'N', 'D', 'O', 'W', 'S', 0}; + /*I use the character 92 = '\' because if you write the character the gcc + * compiler misunderstand it*/ + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + is_window_created = check_window_exists(window_name); + + /*Checks if the window has been created*/ + if (is_window_created) + { + return TRUE; + } + + /*If the first window has not been detected it checks with the alterntive name*/ + if (!is_window_created) + { + if(check_window_exists(window_name_alternative)){ + return TRUE; + } + } + return FALSE; +} + +START_TEST(explorer) +{ + BOOL is_explorer_available; + + /*First we initialize and get th Programs Directoy*/ + init_strings(); + + /*We get if the explorer is avaible and correctcly opens, the we save it into a varible*/ + is_explorer_available = explorer_available(); + + ok(is_explorer_available == TRUE, "No explorer window has opened \n"); + if (!is_explorer_available) + { + win_skip("Explorer.exe is not available \n"); + } +} -- 2.7.4

2 2

[PATCH] Makefile.in: Makefile for explorer.exe tests
by Carlos Vega García 24 Mar '18

24 Mar '18

Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> --- programs/explorer/tests/Makefile.in | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 programs/explorer/tests/Makefile.in diff --git a/programs/explorer/tests/Makefile.in b/programs/explorer/tests/Makefile.in new file mode 100755 index 0000000..422465b --- /dev/null +++ b/programs/explorer/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = explorer.exe +IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi + +C_SRCS = \ + explorer.c -- 2.7.4

2 1

Help with Git
by Carlos Vega García 24 Mar '18

24 Mar '18

I’m trying to submit my patch and I had an error in the build. The tests Works properly and I have tested in the Testbot and I had non errors. This is correction of a patch that I sent on Wednesday. Could someone explain me why I got it wrong this time? Thank you very much for your attention and I hope not to disturb too much. Regards, Carlos Vega

2 1

[PATCH v2] explorer.c: Test for explorer.exe
by Carlos Vega García 24 Mar '18

24 Mar '18

Changes: Now everything follows code rules. The test runs on every windows version. Is prepared for continue making more tests in it. Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> --- programs/explorer/tests/explorer.c | 166 +++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 programs/explorer/tests/explorer.c diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c new file mode 100644 index 0000000..857589d --- /dev/null +++ b/programs/explorer/tests/explorer.c @@ -0,0 +1,166 @@ +/* + * Unit tests for explorer.exe + * + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "dde.h" +#include "ddeml.h" +#include "shlobj.h" +#include "wine/test.h" +#include "winuser.h" +#include <stdio.h> +#include <winbase.h> + +/* We test the explorer.exe. This will be the base for start making other tests + * for future + * funtionalities for the explorer (drag&drop). + * + * Tests already implemented: + * - BOOL explorer_available() + */ + +static BOOL use_common(void) +{ + HMODULE hmod; + static BOOL(WINAPI * pIsNTAdmin)(DWORD, LPDWORD); + + /* IsNTAdmin() is available on all platforms. */ + hmod = LoadLibraryA("advpack.dll"); + pIsNTAdmin = (void *)GetProcAddress(hmod, "IsNTAdmin"); + + if (!pIsNTAdmin(0, NULL)) + { + /* We are definitely not an administrator */ + FreeLibrary(hmod); + return FALSE; + } + FreeLibrary(hmod); + + return TRUE; +} + +static BOOL full_title(void) +{ + CABINETSTATE cs; + + memset(&cs, 0, sizeof(cs)); + ReadCabinetState(&cs, sizeof(cs)); + + return (cs.fFullPathTitle == -1); +} + +static char ProgramsDir[MAX_PATH]; +static void init_strings(void) +{ + char commonprograms[MAX_PATH]; + char programs[MAX_PATH]; + + SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); + + /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before + * Vista + * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) + * or + * not (CSIDL_PROGRAMS). + */ + + if (use_common()) + lstrcpyA(ProgramsDir, commonprograms); + else + lstrcpyA(ProgramsDir, programs); +} + +static BOOL check_window_exists(const char *name) +{ + char title[MAX_PATH]; + HWND window = NULL; + int i; + + if (full_title()) + { + strcpy(title, ProgramsDir); + strcat(title, "\\"); + strcat(title, name); + } + else + + strcpy(title, name); + trace("\n \n Window name: %s \n \n", name); + + /* In the next lines we want to ceck if te specified windows has created. We + * don't know exactly how long it will + * take to open the window so we use a loop and sleep function to wait until + * the window opens. + */ + for (i = 0; i < 20; i++) + { + Sleep(20 + 20 * i); + if ((window = FindWindowA("ExplorerWClass", title)) + || (window = FindWindowA("CabinetWClass", title))) + { + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; + } + } + + return (window != NULL); +} + +/* +*We make a call to open a new explorer window and we test if it finally opens. +*/ +BOOL explorer_available(void) +{ + STARTUPINFOA si; + PROCESS_INFORMATION pi; + + char cmd[] = {'e', 'x', 'p', 'l', 'o', 'r', 'e', 'r', ' ', 'C', + ':', 92, 'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + /*I use the character 92 = '\' because if you write the character the gcc + * compiler misunderstand it*/ + char windowName[] = {'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + /*Checks if the window has been created*/ + if (check_window_exists(windowName)) + { + return TRUE; + } + return FALSE; +} + +START_TEST(explorer) +{ + BOOL is_explorer_available; + + /*First we initialize and get th Programs Directoy*/ + init_strings(); + + /*We get if the explorer is avaible and correctcly opens, the we save it into a varible*/ + is_explorer_available = explorer_available(); + + ok(is_explorer_available == TRUE, "No explorer window has opened \n"); + if (!is_explorer_available) + { + win_skip("Explorer.exe is not available \n"); + } +} -- 2.7.4

2 1

[PATCH 4/4] wsdapi: Add SequenceId to SOAP header, add test.
by Owen Rudge 23 Mar '18

23 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 29 +++++++++++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 15 +++++++++++---- 2 files changed, 38 insertions(+), 6 deletions(-)

1 0

[PATCH 3/4] wsdapi: Add InstanceId and MessageNumber to SOAP header.
by Owen Rudge 23 Mar '18

23 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 127 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 126 insertions(+), 3 deletions(-)

1 0

[PATCH 2/4] wsdapi/tests: Add tests for EndpointReference, AppSequence, MetadataVersion in Hello message.
by Owen Rudge 23 Mar '18

23 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)

1 0

GSoC
by Fatema Sherif 23 Mar '18

23 Mar '18

Hello, I am Fatema and I study Computer Engineering in Egypt. I am interested in participating in Winetest Scripting Interface task in GSOC. I have questions about it. I need to know more details about the scripting language required and the flow of the required task. Sincerely, Fatema Khalid Computer Engineering Third-year student

2 2

[GSOC] Implement calculator app
by Rustam Hadipash 23 Mar '18

23 Mar '18

Hello Developer Team, My name is Rustam Khadipash, I am a forth year student in Computer Science at Pusan National University. This summer I would like to contribute to your project, however I do not have experience in contributing to open source societies so far. Therefore, I would like to start with not a difficult project as "Implement calculator app". I am currently writing proposal and would like to know whether there is an additional information about the project I need to know and how I can get started on the project. Thank you Sincerely, Rustam Khadipash.

2 1

Re: GSOC PROPOSAL FORMAT
by Austin English 23 Mar '18

23 Mar '18

On Fri, Mar 23, 2018 at 1:55 PM, Adeniyi Mayokun <adeniyimayokun17(a)gmail.com> wrote: > Hello, I actually sent 5 different patches via my mail but they were all > rejected and please how do I get in contact with the interested mentors > > On Fri, Mar 23, 2018 at 6:50 PM, Austin English <austinenglish(a)gmail.com> > wrote: >> >> On Fri, Mar 23, 2018 at 5:02 AM, Adeniyi Mayokun >> <adeniyimayokun17(a)gmail.com> wrote: >> > Hello, I am Adeniyi Mayokun and I am interested in working with wine for >> > this year's version of GSOC. I need to know if there is a proposal >> > format to >> > be followed and how can I contact my mentor >> >> There's no set format. We can't tell you who would mentor without >> knowing your project proposal. You can use wine-devel to contact >> interested mentors. >> >> Note that you must have gotten a patch committed to wine to be >> eligible to participate >> >> (https://wiki.winehq.org/Summer_Of_Code#Wine_and_the_Google_Summer_of_Code), >> I don't see a patch from you in git yet.. >> >> -- >> -Austin >> GPG: 267B CC1F 053F 0749 (expires 2021/02/18) As I said in first mail, mentors can be contacted via wine-devel(a)winehq.org. -- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

1 0

[PATCH v4 1/6] wmp: Implement playback via quartz
by Anton Romanov 23 Mar '18

23 Mar '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/player.c | 88 ++++++++++++++++++++++++++++++--- dlls/wmp/tests/Makefile.in | 2 +- dlls/wmp/tests/av.mp4 | Bin 1493 -> 0 bytes dlls/wmp/tests/media.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 6 +-- dlls/wmp/tests/rsrc.rc | 5 +- dlls/wmp/tests/test.mp3 | Bin 0 -> 240333 bytes dlls/wmp/wmp_private.h | 8 ++- 8 files changed, 214 insertions(+), 15 deletions(-) delete mode 100644 dlls/wmp/tests/av.mp4 create mode 100644 dlls/wmp/tests/media.c create mode 100644 dlls/wmp/tests/test.mp3 diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 4a0d0742fd..8925f587bc 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -19,6 +19,8 @@ #include "wmp_private.h" #include "wine/debug.h" +#include <nserror.h> +#include <assert.h> WINE_DEFAULT_DEBUG_CHANNEL(wmp); @@ -119,12 +121,20 @@ static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); IWMPMedia *media; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_w(url)); if(url == NULL) { return E_POINTER; } - media = create_media_from_url(url); - return IWMPPlayer4_put_currentMedia(iface, media); + hres = create_media_from_url(url, &media); + if (SUCCEEDED(hres)) { + hres = IWMPPlayer4_put_currentMedia(iface, media); + IWMPMedia_Release(media); /* put will addref */ + } + if (SUCCEEDED(hres) && This->auto_start) { + hres = IWMPControls_play(&This->IWMPControls_iface); + } + return hres; } static HRESULT WINAPI WMPPlayer4_get_openState(IWMPPlayer4 *iface, WMPOpenState *pwmpos) @@ -1357,16 +1367,58 @@ static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstr static HRESULT WINAPI WMPControls_play(IWMPControls *iface) { + HRESULT hres = S_OK; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + WMPMedia *media; + + TRACE("(%p)\n", This); + + if (!This->wmpmedia) { + return NS_S_WMPCORE_COMMAND_NOT_AVAILABLE; + } + + media = unsafe_impl_from_IWMPMedia(This->wmpmedia); + if (!media) { + FIXME("No support for non-builtin IWMPMedia implementations\n"); + return E_INVALIDARG; + } + + if (!This->pFilterGraph) { + hres = CoCreateInstance(&CLSID_FilterGraph, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IGraphBuilder, + (void **)&This->pFilterGraph); + if (SUCCEEDED(hres)) + hres = IGraphBuilder_RenderFile(This->pFilterGraph, media->url, NULL); + if (SUCCEEDED(hres)) + hres = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaControl, + (void**)&This->media_control); + } + + if (SUCCEEDED(hres)) + hres = IMediaControl_Run(This->media_control); + + if (hres == S_FALSE) { + hres = S_OK; /* S_FALSE will mean that graph is transitioning and that is fine */ + } + return hres; } static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) { + HRESULT hres = S_OK; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + if (!This->pFilterGraph) { + return NS_S_WMPCORE_COMMAND_NOT_AVAILABLE; + } + hres = IMediaControl_Stop(This->media_control); + IGraphBuilder_Release(This->pFilterGraph); + IMediaControl_Release(This->media_control); + This->pFilterGraph = NULL; + This->media_control = NULL; + return hres; } static HRESULT WINAPI WMPControls_pause(IWMPControls *iface) @@ -1741,16 +1793,36 @@ void init_player(WindowsMediaPlayer *wmp) void destroy_player(WindowsMediaPlayer *wmp) { + IWMPControls_stop(&wmp->IWMPControls_iface); if(wmp->wmpmedia) IWMPMedia_Release(wmp->wmpmedia); } -IWMPMedia* create_media_from_url(BSTR url){ +WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) +{ + if (iface->lpVtbl == &WMPMediaVtbl) { + return CONTAINING_RECORD(iface, WMPMedia, IWMPMedia_iface); + } + return NULL; +} +HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) +{ WMPMedia *media = heap_alloc_zero(sizeof(WMPMedia)); + + if (!media) { + return E_OUTOFMEMORY; + } + media->IWMPMedia_iface.lpVtbl = &WMPMediaVtbl; media->url = heap_strdupW(url); media->ref = 1; - return &media->IWMPMedia_iface; + if (media->url) { + *ppMedia = &media->IWMPMedia_iface; + + return S_OK; + } + IWMPMedia_Release(&media->IWMPMedia_iface); + return E_OUTOFMEMORY; } diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index dded3a4a7e..b4ecf3ffda 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = wmp.dll IMPORTS = ole32 oleaut32 user32 gdi32 -C_SRCS = oleobj.c +C_SRCS = oleobj.c media.c RC_SRCS = \ rsrc.rc diff --git a/dlls/wmp/tests/av.mp4 b/dlls/wmp/tests/av.mp4 deleted file mode 100644 index 1431e98dd3f5bb28c282d3d732a3a1fc13cf3d63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1493 zcmeHHO-sW-5Z$D$cn}OyK`=rq^=7}c+G`IUJa`ik#7o*uZD_U$*=<2j`7uHf{1GDl z1OJ2v!Gm5r>6;{NZ56!et&eVJ_RZ{@-Py2=F|(~MeMfqNF`bdc*b#oM${1U02eu9V zMQ}^yjZE%({o@Y&97zZ2!~blBKX3W>_ST2tck=HTAD{cZ@Vo&eT`}nJY3bAx=4GZa z`b{u30X;KsOfrA+Qdsb;0;`MQx#~tW!HuCOUU|%5K~!R<&M$QfHdhiFrtM0VXpus! z8w+y59SdAe@Y%E99^ge_ClAreVu!myqQRus?~Q!2$C&d&tH)iNa<paP^xAL?DW*gV zJmyUv*c2zwHkSH<n@jvhshTeQ3#sJjGAQR1Zxn5mK=T+nGsvN>0=u^4bYPYW!*CPt zTN*aoSS3n(!+3qqfYDcs1sIL`ye3uDqbLP`;L_xqDBmInpmH=QpDe|$U`GJ2p{zzd z&Pvttk^tpyV>J6*S+Hlqjx2@qU;BwW2rS>HV~<gE;!E4QQ633y;7KMC5@ko$puM+W Ks#QwWO7#=93TT)B diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c new file mode 100644 index 0000000000..6e4a0c170f --- /dev/null +++ b/dlls/wmp/tests/media.c @@ -0,0 +1,120 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include <wmp.h> +#include <olectl.h> +#include <nserror.h> + +#include "wine/test.h" + +static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; +static inline WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + +static void test_wmp(void) +{ + IWMPPlayer4 *player4; + IWMPControls *controls; + HRESULT hres; + BSTR filename; + + IOleObject *oleobj; + IWMPSettings *settings; + + hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); + if(hres == REGDB_E_CLASSNOTREG) { + win_skip("CLSID_WindowsMediaPlayer not registered\n"); + return; + } + ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + + hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); + ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + + settings = NULL; + hres = IWMPPlayer4_get_settings(player4, &settings); + ok(hres == S_OK, "get_settings failed: %08x\n", hres); + ok(settings != NULL, "settings = NULL\n"); + + hres = IWMPSettings_put_autoStart(settings, VARIANT_FALSE); + ok(hres == S_OK, "Could not put autoStart in IWMPSettings: %08x\n", hres); + IWMPSettings_Release(settings); + + controls = NULL; + hres = IWMPPlayer4_get_controls(player4, &controls); + ok(hres == S_OK, "get_controls failed: %08x\n", hres); + ok(controls != NULL, "controls = NULL\n"); + + hres = IWMPControls_play(controls); + ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); + + filename = SysAllocString(load_resource(mp3file)); + + hres = IWMPPlayer4_put_URL(player4, filename); + ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08x\n", hres); + + hres = IWMPControls_play(controls); + ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); + + hres = IWMPControls_stop(controls); + ok(hres == S_OK, "IWMPControls_stop failed: %08x\n", hres); + + /* Already Stopped */ + hres = IWMPControls_stop(controls); + ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_stop is available: %08x\n", hres); + + hres = IWMPControls_play(controls); + ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); + + IWMPControls_Release(controls); + IWMPPlayer4_Release(player4); + IOleObject_Release(oleobj); + DeleteFileW(filename); + SysFreeString(filename); +} + +START_TEST(media) +{ + CoInitialize(NULL); + + test_wmp(); + + CoUninitialize(); +} diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index e4c2294436..41179dae5d 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -70,7 +70,7 @@ DEFINE_EXPECT(GetWindowContext); DEFINE_EXPECT(ShowObject); DEFINE_EXPECT(OnShowWindow_FALSE); -static const WCHAR mp4file[] = {'a','v','.','m','p','4',0}; +static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; static inline WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -942,8 +942,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) ok(hres == S_FALSE, "get_currentMedia SUCCEEDED\n"); ok(media == NULL, "media != NULL\n"); - filename = SysAllocString(load_resource(mp4file)); - + filename = SysAllocString(load_resource(mp3file)); SET_EXPECT(GetContainer); SET_EXPECT(Invoke_USERMODE); @@ -1039,6 +1038,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings_Release(settings); IWMPPlayer_Release(player); + DeleteFileW(filename); SysFreeString(filename); } diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc index fb30ae6940..f33acc1256 100644 --- a/dlls/wmp/tests/rsrc.rc +++ b/dlls/wmp/tests/rsrc.rc @@ -18,5 +18,6 @@ #include "windef.h" -/* @makedep: av.mp4 */ -av.mp4 RCDATA "av.mp4" +/* ffmpeg -ar 48000 -t 60 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 output.mp3 */ +/* @makedep: test.mp3 */ +test.mp3 RCDATA "test.mp3" diff --git a/dlls/wmp/tests/test.mp3 b/dlls/wmp/tests/test.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..149a2cd346ee52ae179c46198ce290a5dd4d6251 GIT binary patch literal 240333 zcmeI%f23Xo0LJlCcd=qF8IkluD<ZR5KSsq;mzGVmT``eqrkEu$6EP~1m`IVNlq5-1 zBqA}9NQp$^ij2req${`gz5Vg*;oRHE``_o9?faaU<K1!gx#zyyedmr1!}ROw{rmPU zO#Yl7hPgclj~%}8=B+z-Y~8+X+v=<T{<gBb|Ex8hyN@1zWb(@7G#8#4=H7X2n7d%( zMVsa?-h9cWmtAqymTRxOe(UxfH|@OTwq18D+;#Wfd+yzT-+}udIC$vrLr0E2`q;7K zk3VtZ$)}%r_PLYKzwpw_ue|#D8*jb+?tAZl@X^PgeEQkvr@r{|tFOQL?)x8p{Auau zUrzt}+nL}0`17y7r|)F)o*$gN=j~^|-(k!7yQZ&A-^a=|Pn}*_-h617KQjyuPmXOI zhD}!v!+DcmZ%*bUZ#Xdw8}{73cVYGKy*To<?u(0y)AL{cALk!AYYv^m`EQ-^`47za z{Ksc}{ugI_{tst-{%>b|{-u-a-~YK8N9r8zPv@VaIdbhLho(NbKCaLB-7z`p-`9pU zug&xY*T?no{mb{4wUFQgANarrKCJoq##)zV^*BHI$xnW+g#;h?zz06?!SmI~J>c{0 z_5SnF=l?#x9XvmHe(?M-^1WmAke@I3zz06?!Os^X_kf=-{CqKTTjY@E2hR_lA3Q%q zgf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h=@PQ9}hzMPL z-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g_z)4g_`nA~ z@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzTbn$@?eBeW? zki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJANatBRw0WI zeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD53NELANarr zK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2EI#mo4}6FS zU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M10VPh5xV%m z2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06?AtH3~fe(D( zL#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{;sYP}z=u{L ziw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn@PQAlLKYwR zzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h=@PQ9} zhzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g_z)4g z_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzTbn$@? zeBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJANatB zRw0WIeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD53NEL zANarrK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2EI#mo z4}6FSU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M10VPh z5xV%m2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06?AtH3~ zfe(D(L#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{;sYP} zz=u{Liw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn@PQAl zLKYwRzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8gT7@h= z@PQ9}hzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g z_z)4g_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzT zbn$@?eBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJ zANatBRw0WIeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG@10VRnhltR{2R`tD z53NELANarrK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I@10Pz2 zEI#mo4}6FSU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M z10VPh5xV%m2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr@PQ9}Xce;fzz06? zAtH3~fe(D(L#vR*2R`tD4-uh@4}9PQA6kVhKJbALe255LeBc8g_|Ph3@qrI~;6p^{ z;sYP}z=u{Liw}I@10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn z@PQAlLKYwRzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9@eBc8g zT7@h=@PQ9}hzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1 zeBc8g_z)4g_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIU zKJXzTbn$@?eBeW?ki`c+@PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE725C6x9 d+)1Ogvb_1wlJk#Vo9RK<XU$8q`ogTQ&p*pvqh$a9 literal 0 HcmV?d00001 diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index e95b194d77..13ec268a86 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -22,6 +22,7 @@ #include "wine/heap.h" #include "wine/unicode.h" #include "ole2.h" +#include "dshow.h" #include "wmp.h" typedef struct { @@ -70,11 +71,16 @@ struct WindowsMediaPlayer { ConnectionPoint *wmpocx; IWMPMedia *wmpmedia; + + /* DirectShow stuff */ + IGraphBuilder* pFilterGraph; + IMediaControl* media_control; }; void init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; -IWMPMedia* create_media_from_url(BSTR url); +WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) DECLSPEC_HIDDEN; +HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) DECLSPEC_HIDDEN; void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; -- 2.16.2

3 13

GSOC PROPOSAL FORMAT
by Adeniyi Mayokun 23 Mar '18

23 Mar '18

Hello, I am Adeniyi Mayokun and I am interested in working with wine for this year's version of GSOC. I need to know if there is a proposal format to be followed and how can I contact my mentor

2 1

iphlpapi: Add support for MibIfTableNormalWithoutStatistics in GetIfTable2Ex (try 2)
by André Hentschel 23 Mar '18

23 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/iphlpapi/iphlpapi_main.c | 2 +- dlls/iphlpapi/tests/iphlpapi.c | 8 +++++++- include/netioapi.h | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 604470a..d81fb6a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1862,7 +1862,7 @@ DWORD WINAPI GetIfTable2Ex( MIB_IF_TABLE_LEVEL level, MIB_IF_TABLE2 **table ) TRACE( "level %u, table %p\n", level, table ); - if (!table || level > MibIfTableRaw) + if (!table || level > MibIfTableNormalWithoutStatistics) return ERROR_INVALID_PARAMETER; if (level != MibIfTableNormal) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 3509005..ba7d7f1 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2009,7 +2009,13 @@ static void test_GetIfTable2Ex(void) pFreeMibTable( table ); table = NULL; - ret = pGetIfTable2Ex( 2, &table ); + ret = pGetIfTable2Ex( MibIfTableNormalWithoutStatistics, &table ); + ok( ret == NO_ERROR || broken(ret == ERROR_INVALID_PARAMETER), "got %u\n", ret ); + ok( table != NULL || broken(!table), "table not set\n" ); + pFreeMibTable( table ); + + table = NULL; + ret = pGetIfTable2Ex( 3, &table ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); ok( !table, "table should not be set\n" ); pFreeMibTable( table ); diff --git a/include/netioapi.h b/include/netioapi.h index 4bd64e8..11cadf6 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -24,7 +24,8 @@ typedef enum _MIB_IF_TABLE_LEVEL { MibIfTableNormal, - MibIfTableRaw + MibIfTableRaw, + MibIfTableNormalWithoutStatistics, } MIB_IF_TABLE_LEVEL, *PMIB_IF_TABLE_LEVEL; typedef enum _MIB_NOTIFICATION_TYPE -- 2.7.4

1 0

[PATCH] wined3d: Avoid superfluous wglSwapIntervalEXT() calls.
by Józef Kucia 23 Mar '18

23 Mar '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 4 +--- dlls/wined3d/swapchain.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 24fd72c449f9..8edb74fc74c6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -453,9 +453,7 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) swapchain = op->swapchain; wined3d_swapchain_set_window(swapchain, op->dst_window_override); - - if (swapchain->swap_interval != op->swap_interval) - wined3d_swapchain_set_swap_interval(swapchain, op->swap_interval); + wined3d_swapchain_set_swap_interval(swapchain, op->swap_interval); swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->flags); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 464a6c0b0ff4..2aec612018c3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -679,12 +679,15 @@ void wined3d_swapchain_set_swap_interval(struct wined3d_swapchain *swapchain, const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - context = context_acquire(swapchain->device, swapchain->front_buffer, 0); - gl_info = context->gl_info; - swap_interval = swap_interval <= 4 ? swap_interval : 1; + if (swapchain->swap_interval == swap_interval) + return; + swapchain->swap_interval = swap_interval; + context = context_acquire(swapchain->device, swapchain->front_buffer, 0); + gl_info = context->gl_info; + if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) { if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) @@ -735,8 +738,6 @@ static void wined3d_swapchain_cs_init(void *object) FIXME("Add OpenGL context recreation support.\n"); context_release(swapchain->context[0]); - - wined3d_swapchain_set_swap_interval(swapchain, WINED3D_SWAP_INTERVAL_DEFAULT); } static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, @@ -747,9 +748,9 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 BOOL displaymode_set = FALSE; DWORD texture_flags = 0; RECT client_rect; + unsigned int i; HWND window; HRESULT hr; - UINT i; if (desc->backbuffer_count > 1) { @@ -775,6 +776,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 swapchain->ref = 1; swapchain->win_handle = window; swapchain->device_window = window; + swapchain->swap_interval = WINED3D_SWAP_INTERVAL_DEFAULT; if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, adapter->ordinal, &swapchain->original_mode, NULL))) -- 2.16.1

2 1

[PATCH 01/10] d3dx9: Fix handling of includes in D3DXCreateEffectFromFileExW().
by Matteo Bruni 23 Mar '18

23 Mar '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- For bug 43863 (Rollcage Redux). dlls/d3dx9_36/d3dx9_private.h | 8 ++++++++ dlls/d3dx9_36/effect.c | 37 ++++++++++++++++++++++++++++++------- dlls/d3dx9_36/shader.c | 38 +++++++++++++++++--------------------- 3 files changed, 55 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 2044b2af448..6cc1126c80f 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -69,6 +69,14 @@ struct pixel_format_desc { void (*to_rgba)(const struct vec4 *src, struct vec4 *dst, const PALETTEENTRY *palette); }; +struct d3dx_include_from_file +{ + ID3DXInclude ID3DXInclude_iface; +}; + +extern CRITICAL_SECTION from_file_mutex DECLSPEC_HIDDEN; +extern const struct ID3DXIncludeVtbl d3dx_include_from_file_vtbl DECLSPEC_HIDDEN; + static inline BOOL is_conversion_from_supported(const struct pixel_format_desc *format) { if (format->type == FORMAT_ARGB || format->type == FORMAT_ARGBF16 diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 33e0fc4cdae..7675f17e403 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6664,8 +6664,10 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, #endif unsigned int i, j; - TRACE("base %p, data %p, data_size %lu, effect %p, pool %p, skip_constants %s.\n", - base, data, data_size, effect, pool, debugstr_a(skip_constants_string)); + TRACE("base %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, " + "effect %p, pool %p, skip_constants %s.\n", + base, data, data_size, defines, include, eflags, errors, effect, pool, + debugstr_a(skip_constants_string)); base->effect = effect; base->pool = pool; @@ -7041,9 +7043,11 @@ HRESULT WINAPI D3DXCreateEffectFromFileExW(struct IDirect3DDevice9 *device, cons const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skipconstants, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors) { - void *buffer; + struct d3dx_include_from_file include_from_file; + const void *buffer; + unsigned int size; + char *filename_a; HRESULT ret; - DWORD size; TRACE("device %p, srcfile %s, defines %p, include %p, skipconstants %s, " "flags %#x, pool %p, effect %p, compilationerrors %p.\n", @@ -7053,14 +7057,33 @@ HRESULT WINAPI D3DXCreateEffectFromFileExW(struct IDirect3DDevice9 *device, cons if (!device || !srcfile) return D3DERR_INVALIDCALL; - ret = map_view_of_file(srcfile, &buffer, &size); + if (!include) + { + include_from_file.ID3DXInclude_iface.lpVtbl = &d3dx_include_from_file_vtbl; + include = &include_from_file.ID3DXInclude_iface; + } + size = WideCharToMultiByte(CP_ACP, 0, srcfile, -1, NULL, 0, NULL, NULL); + filename_a = heap_alloc(size); + if (!filename_a) + return E_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, srcfile, -1, filename_a, size, NULL, NULL); + + EnterCriticalSection(&from_file_mutex); + ret = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &size); if (FAILED(ret)) + { + LeaveCriticalSection(&from_file_mutex); + heap_free(filename_a); return D3DXERR_INVALIDDATA; + } - ret = D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, effect, compilationerrors); - UnmapViewOfFile(buffer); + ret = D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, + effect, compilationerrors); + ID3DXInclude_Close(include, buffer); + LeaveCriticalSection(&from_file_mutex); + heap_free(filename_a); return ret; } diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index f3724947601..acbbf0718ad 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -214,7 +214,6 @@ HRESULT WINAPI D3DXAssembleShader(const char *data, UINT data_len, const D3DXMAC static const void *main_file_data; -static CRITICAL_SECTION from_file_mutex; static CRITICAL_SECTION_DEBUG from_file_mutex_debug = { 0, 0, &from_file_mutex, @@ -224,14 +223,14 @@ static CRITICAL_SECTION_DEBUG from_file_mutex_debug = }, 0, 0, {(DWORD_PTR)(__FILE__ ": from_file_mutex")} }; -static CRITICAL_SECTION from_file_mutex = {&from_file_mutex_debug, -1, 0, 0, 0, 0}; +CRITICAL_SECTION from_file_mutex = {&from_file_mutex_debug, -1, 0, 0, 0, 0}; /* D3DXInclude private implementation, used to implement * D3DXAssembleShaderFromFile() from D3DXAssembleShader(). */ /* To be able to correctly resolve include search paths we have to store the * pathname of each include file. We store the pathname pointer right before * the file data. */ -static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_TYPE include_type, +static HRESULT WINAPI d3dx_include_from_file_open(ID3DXInclude *iface, D3DXINCLUDE_TYPE include_type, const char *filename, const void *parent_data, const void **data, UINT *bytes) { const char *p, *parent_name = ""; @@ -250,7 +249,7 @@ static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_T parent_name = *((const char **)main_file_data - 1); } - TRACE("Looking up for include file %s, parent %s\n", debugstr_a(filename), debugstr_a(parent_name)); + TRACE("Looking up include file %s, parent %s.\n", debugstr_a(filename), debugstr_a(parent_name)); if ((p = strrchr(parent_name, '\\'))) ++p; @@ -301,7 +300,7 @@ error: return HRESULT_FROM_WIN32(GetLastError()); } -static HRESULT WINAPI d3dincludefromfile_close(ID3DXInclude *iface, const void *data) +static HRESULT WINAPI d3dx_include_from_file_close(ID3DXInclude *iface, const void *data) { HeapFree(GetProcessHeap(), 0, *((char **)data - 1)); HeapFree(GetProcessHeap(), 0, (char **)data - 1); @@ -310,13 +309,10 @@ static HRESULT WINAPI d3dincludefromfile_close(ID3DXInclude *iface, const void * return S_OK; } -static const struct ID3DXIncludeVtbl D3DXInclude_Vtbl = { - d3dincludefromfile_open, - d3dincludefromfile_close -}; - -struct D3DXIncludeImpl { - ID3DXInclude ID3DXInclude_iface; +const struct ID3DXIncludeVtbl d3dx_include_from_file_vtbl = +{ + d3dx_include_from_file_open, + d3dx_include_from_file_close }; HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines, @@ -348,7 +344,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR const void *buffer; DWORD len; HRESULT hr; - struct D3DXIncludeImpl includefromfile; + struct d3dx_include_from_file include_from_file; char *filename_a; TRACE("filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", @@ -356,8 +352,8 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR if(!include) { - includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; - include = &includefromfile.ID3DXInclude_iface; + include_from_file.ID3DXInclude_iface.lpVtbl = &d3dx_include_from_file_vtbl; + include = &include_from_file.ID3DXInclude_iface; } len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); @@ -481,7 +477,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO const void *buffer; DWORD len, filename_len; HRESULT hr; - struct D3DXIncludeImpl includefromfile; + struct d3dx_include_from_file include_from_file; char *filename_a; TRACE("filename %s, defines %p, include %p, entrypoint %s, profile %s, " @@ -491,8 +487,8 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO if (!include) { - includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; - include = &includefromfile.ID3DXInclude_iface; + include_from_file.ID3DXInclude_iface.lpVtbl = &d3dx_include_from_file_vtbl; + include = &include_from_file.ID3DXInclude_iface; } filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); @@ -606,7 +602,7 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA const void *buffer; DWORD len; HRESULT hr; - struct D3DXIncludeImpl includefromfile; + struct d3dx_include_from_file include_from_file; char *filename_a; TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n", @@ -614,8 +610,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA if (!include) { - includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; - include = &includefromfile.ID3DXInclude_iface; + include_from_file.ID3DXInclude_iface.lpVtbl = &d3dx_include_from_file_vtbl; + include = &include_from_file.ID3DXInclude_iface; } len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); -- 2.13.6

3 12

iphlpapi: Add support for MibIfTableNormalWithoutStatistics in GetIfTable2Ex
by André Hentschel 23 Mar '18

23 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/iphlpapi/iphlpapi_main.c | 2 +- dlls/iphlpapi/tests/iphlpapi.c | 8 +++++++- include/netioapi.h | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 604470a..d81fb6a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1862,7 +1862,7 @@ DWORD WINAPI GetIfTable2Ex( MIB_IF_TABLE_LEVEL level, MIB_IF_TABLE2 **table ) TRACE( "level %u, table %p\n", level, table ); - if (!table || level > MibIfTableRaw) + if (!table || level > MibIfTableNormalWithoutStatistics) return ERROR_INVALID_PARAMETER; if (level != MibIfTableNormal) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 3509005..6272a99 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2009,7 +2009,13 @@ static void test_GetIfTable2Ex(void) pFreeMibTable( table ); table = NULL; - ret = pGetIfTable2Ex( 2, &table ); + ret = pGetIfTable2Ex( MibIfTableNormalWithoutStatistics, &table ); + ok( ret == NO_ERROR, "got %u\n", ret ); + ok( table != NULL, "table not set\n" ); + pFreeMibTable( table ); + + table = NULL; + ret = pGetIfTable2Ex( 3, &table ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); ok( !table, "table should not be set\n" ); pFreeMibTable( table ); diff --git a/include/netioapi.h b/include/netioapi.h index 4bd64e8..11cadf6 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -24,7 +24,8 @@ typedef enum _MIB_IF_TABLE_LEVEL { MibIfTableNormal, - MibIfTableRaw + MibIfTableRaw, + MibIfTableNormalWithoutStatistics, } MIB_IF_TABLE_LEVEL, *PMIB_IF_TABLE_LEVEL; typedef enum _MIB_NOTIFICATION_TYPE -- 2.7.4

2 1

ntdll: Fix build on PowerPC
by André Hentschel 23 Mar '18

23 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_powerpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index cb5089b..d86412a 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1171,7 +1171,7 @@ static void thread_startup( void *param ) context.Iar = (DWORD)info->start; if (info->suspend) wait_suspend( &context ); - attach_dlls( &context, (void **)&context->Gpr3 ); + attach_dlls( &context, (void **)&context.Gpr3 ); ((thread_start_func)context.Iar)( (LPTHREAD_START_ROUTINE)context.Gpr3, (void *)context.Gpr4 ); } -- 2.7.4

1 0

[PATCH v3 1/6] winevulkan: Add helper function for VkDeviceCreateInfo conversion.
by Józef Kucia 23 Mar '18

23 Mar '18

From: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 3: * Simplify wine_vk_device_convert_create_info() a bit. * Remove outdated comment. --- dlls/winevulkan/vulkan.c | 62 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a5b8a96e9115..d294b0a03189 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -98,6 +98,52 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, return queues; } +/* Helper function to convert win32 VkDeviceCreateInfo to host compatible. */ +static void wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src, + VkDeviceCreateInfo *dst) +{ + unsigned int i; + + *dst = *src; + + /* Application and loader can pass in a chain of extensions through pNext. + * We can't blindly pass these through as often these contain callbacks or + * they can even be pass structures for loader / ICD internal use. For now + * we ignore everything in pNext chain, but we print FIXMEs. + */ + if (src->pNext) + { + const struct wine_vk_structure_header *header; + + for (header = src->pNext; header; header = header->pNext) + { + switch (header->sType) + { + case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO: + /* Used for loader to ICD communication. Ignore to not confuse + * host loader. + */ + break; + + default: + FIXME("Application requested a linked structure of type %#x.\n", header->sType); + } + } + } + /* For now don't support anything. */ + dst->pNext = NULL; + + /* Should be filtered out by loader as ICDs don't support layers. */ + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + + TRACE("Enabled extensions: %u\n", dst->enabledExtensionCount); + for (i = 0; i < dst->enabledExtensionCount; i++) + { + TRACE("Extension %u: %s\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); + } +} + /* Helper function used for freeing a device structure. This function supports full * and partial object cleanups and can thus be used for vkCreateDevice failures. */ @@ -469,8 +515,9 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkDevice *device) { - struct VkDevice_T *object = NULL; + VkDeviceCreateInfo create_info_host; uint32_t max_queue_families; + struct VkDevice_T *object; VkResult res; unsigned int i; @@ -485,11 +532,10 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - /* At least for now we can directly pass create_info through. All extensions we report - * should be compatible. In addition the loader is supposed to sanitize values e.g. layers. - */ + wine_vk_device_convert_create_info(create_info, &create_info_host); + res = phys_dev->instance->funcs.p_vkCreateDevice(phys_dev->phys_dev, - create_info, NULL /* allocator */, &object->device); + &create_info_host, NULL /* allocator */, &object->device); if (res != VK_SUCCESS) { ERR("Failed to create device\n"); @@ -524,10 +570,10 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, goto err; } - for (i = 0; i < create_info->queueCreateInfoCount; i++) + for (i = 0; i < create_info_host.queueCreateInfoCount; i++) { - uint32_t family_index = create_info->pQueueCreateInfos[i].queueFamilyIndex; - uint32_t queue_count = create_info->pQueueCreateInfos[i].queueCount; + uint32_t family_index = create_info_host.pQueueCreateInfos[i].queueFamilyIndex; + uint32_t queue_count = create_info_host.pQueueCreateInfos[i].queueCount; TRACE("queueFamilyIndex %u, queueCount %u\n", family_index, queue_count); -- 2.16.1

1 5

[PATCH 3/3] bcrypt/tests: Add basic test for ECDSA.
by Hans Leidekker 23 Mar '18

23 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 971dee5b1d..57d04882b5 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -50,6 +50,8 @@ static NTSTATUS (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); static NTSTATUS (WINAPI *pBCryptImportKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptExportKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptImportKeyPair)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptVerifySignature)(BCRYPT_KEY_HANDLE, VOID *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG); static void test_BCryptGenRandom(void) { @@ -1433,6 +1435,66 @@ static void test_key_import_export(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static BYTE eccPubkey[] = +{ + /* X */ + 0x3b, 0x3c, 0x34, 0xc8, 0x3f, 0x15, 0xea, 0x02, 0x68, 0x46, 0x69, 0xdf, 0x0c, 0xa6, 0xee, 0x7a, + 0xd9, 0x82, 0x08, 0x9b, 0x37, 0x53, 0x42, 0xf3, 0x13, 0x63, 0xda, 0x65, 0x79, 0xe8, 0x04, 0x9e, + /* Y */ + 0x8c, 0x77, 0xc4, 0x33, 0x77, 0xd9, 0x5a, 0x7f, 0x60, 0x7b, 0x98, 0xce, 0xf3, 0x96, 0x56, 0xd6, + 0xb5, 0x8d, 0x87, 0x7a, 0x00, 0x2b, 0xf3, 0x70, 0xb3, 0x90, 0x73, 0xa0, 0x56, 0x06, 0x3b, 0x22, +}; +static BYTE certHash[] = +{ + 0x28, 0x19, 0x0f, 0x15, 0x6d, 0x75, 0xcc, 0xcf, 0x62, 0xf1, 0x5e, 0xe6, 0x8a, 0xc3, 0xf0, 0x5d, + 0x89, 0x28, 0x2d, 0x48, 0xd8, 0x73, 0x7c, 0x05, 0x05, 0x8e, 0xbc, 0xce, 0x28, 0xb7, 0xba, 0xc9, +}; +static BYTE certSignature[] = +{ + /* r */ + 0xd7, 0x29, 0xce, 0x5a, 0xef, 0x74, 0x85, 0xd1, 0x18, 0x5f, 0x6e, 0xf1, 0xba, 0x53, 0xd4, 0xcd, + 0xdd, 0xe0, 0x5d, 0xf1, 0x5e, 0x48, 0x51, 0xea, 0x63, 0xc0, 0xe8, 0xe2, 0xf6, 0xfa, 0x4c, 0xaf, + /* s */ + 0xe3, 0x94, 0x15, 0x3b, 0x6c, 0x71, 0x6e, 0x44, 0x22, 0xcb, 0xa0, 0x88, 0xcd, 0x0a, 0x5a, 0x50, + 0x29, 0x7c, 0x5c, 0xd6, 0x6c, 0xd2, 0xe0, 0x7f, 0xcd, 0x02, 0x92, 0x21, 0x4c, 0x2c, 0x92, 0xee, +}; + +static void test_ECDSA(void) +{ + BYTE buffer[sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPubkey)]; + BCRYPT_ECCKEY_BLOB *ecckey = (void *)buffer; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_KEY_HANDLE key = NULL; + NTSTATUS status; + + status = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); + if (status) + { + skip("Failed to open ECDSA provider: %08x, skipping test\n", status); + return; + } + + ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + memcpy(ecckey + 1, eccPubkey, sizeof(eccPubkey)); + + ecckey->cbKey = 2; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->cbKey = sizeof(eccPubkey) / 2; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + ok(!status, "BCryptImportKeyPair failed: %08x\n", status); + + status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); + ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); + + status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); + ok(!status, "BCryptVerifySignature failed: %08x\n", status); + + pBCryptDestroyKey(key); + pBCryptCloseAlgorithmProvider(alg, 0); +} + START_TEST(bcrypt) { HMODULE module; @@ -1463,6 +1525,8 @@ START_TEST(bcrypt) pBCryptDestroyKey = (void *)GetProcAddress(module, "BCryptDestroyKey"); pBCryptImportKey = (void *)GetProcAddress(module, "BCryptImportKey"); pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey"); + pBCryptImportKeyPair = (void *)GetProcAddress(module, "BCryptImportKeyPair"); + pBCryptVerifySignature = (void *)GetProcAddress(module, "BCryptVerifySignature"); test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); @@ -1473,6 +1537,7 @@ START_TEST(bcrypt) test_BCryptEncrypt(); test_BCryptDecrypt(); test_key_import_export(); + test_ECDSA(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); -- 2.11.0

1 0

[PATCH 2/3] bcrypt: Add support for 192 and 256 bit AES keys.
by Hans Leidekker 23 Mar '18

23 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 14 ++++++++++++-- dlls/bcrypt/tests/bcrypt.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 1aeafd0dd8..69d5129a7d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1003,11 +1003,21 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) WARN( "handle block size\n" ); switch (key->mode) { - case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_GCM: + if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_GCM; + if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_GCM; + break; case MODE_ID_ECB: /* can be emulated with CBC + empty IV */ case MODE_ID_CBC: - default: return GNUTLS_CIPHER_AES_128_CBC; + if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_CBC; + if (key->secret_len == 24) return GNUTLS_CIPHER_AES_192_CBC; + if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_CBC; + break; + default: + break; } + FIXME( "aes mode %u with key length %u not supported\n", key->mode, key->secret_len ); + return GNUTLS_CIPHER_UNKNOWN; default: FIXME( "algorithm %u not supported\n", key->alg_id ); return GNUTLS_CIPHER_UNKNOWN; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3abbd759e9..971dee5b1d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -622,6 +622,9 @@ static void test_BCryptEncrypt(void) {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; static UCHAR secret[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR secret256[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, + 0x0f,0x0e,0x0d,0x0c,0x0b,0x0a,0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00}; static UCHAR iv[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; static UCHAR data[] = @@ -654,6 +657,10 @@ static void test_BCryptEncrypt(void) {0xb5,0x8a,0x10,0x64,0xd8,0xac,0xa9,0x9b,0xd9,0xb0,0x40,0x5b,0x85,0x45,0xf5,0xbb}; static UCHAR expected9[] = {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a}; + static UCHAR expected10[] = + {0x66,0xb8,0xbd,0xe5,0x90,0x6c,0xec,0xdf,0xfa,0x8a,0xb2,0xfd,0x92,0x84,0xeb,0xf0, + 0x95,0xc4,0xdf,0xa7,0x7a,0x62,0xe4,0xab,0xd4,0x0e,0x94,0x4e,0xd7,0x6e,0xa1,0x47, + 0x29,0x4b,0x37,0xfe,0x28,0x6d,0x5f,0x69,0x46,0x30,0x73,0xc0,0xaa,0x42,0xe4,0x46}; static UCHAR expected_tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR expected_tag2[] = @@ -785,6 +792,31 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + /* 256 bit key */ + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret256, sizeof(secret256), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + ok(!memcmp(ciphertext, expected10, sizeof(expected10)), "wrong data\n"); + for (i = 0; i < 48; i++) + ok(ciphertext[i] == expected10[i], "%u: %02x != %02x\n", i, ciphertext[i], expected10[i]); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + /****************** * AES - GCM mode * ******************/ -- 2.11.0

1 0

[PATCH 1/3] bcrypt: Implement support for ECB chain mode.
by Hans Leidekker 23 Mar '18

23 Mar '18

Based on a patch by Sebastian Lackner. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 72 ++++++++++-- dlls/bcrypt/tests/bcrypt.c | 275 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 330 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index e05e94ce73..1aeafd0dd8 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -225,6 +225,7 @@ enum alg_id enum mode_id { + MODE_ID_ECB, MODE_ID_CBC, MODE_ID_GCM }; @@ -574,8 +575,9 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop const WCHAR *mode; switch (alg->mode) { - case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; + case MODE_ID_ECB: mode = BCRYPT_CHAIN_MODE_ECB; break; case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; + case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; default: return STATUS_NOT_IMPLEMENTED; } @@ -628,7 +630,12 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA case ALG_ID_AES: if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + { + alg->mode = MODE_ID_ECB; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) { alg->mode = MODE_ID_CBC; return STATUS_SUCCESS; @@ -962,7 +969,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val { if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + { + key->mode = MODE_ID_ECB; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) { key->mode = MODE_ID_CBC; return STATUS_SUCCESS; @@ -992,6 +1004,7 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) switch (key->mode) { case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_ECB: /* can be emulated with CBC + empty IV */ case MODE_ID_CBC: default: return GNUTLS_CIPHER_AES_128_CBC; } @@ -1104,6 +1117,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s case ALG_ID_AES: switch (alg->mode) { + case MODE_ID_ECB: case MODE_ID_CBC: break; default: @@ -1133,13 +1147,47 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) { - FIXME( "not implemented on Mac\n" ); + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + { + key->mode = MODE_ID_ECB; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + { + key->mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else + { + FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + return STATUS_NOT_IMPLEMENTED; + } + } + + FIXME( "unsupported key property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; } +static CCMode get_cryptor_mode( struct key *key ) +{ + switch (key->mode) + { + case MODE_ID_ECB: return kCCModeECB; + case MODE_ID_CBC: return kCCModeCBC; + default: + FIXME( "unsupported mode %u\n", key->mode ); + return 0; + } +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { CCCryptorStatus status; + CCMode mode; + + if (!(mode = get_cryptor_mode( key ))) return STATUS_NOT_SUPPORTED; if (key->ref_encrypt) { @@ -1152,14 +1200,14 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) key->ref_decrypt = NULL; } - if ((status = CCCryptorCreateWithMode( kCCEncrypt, kCCModeCBC, kCCAlgorithmAES128, ccNoPadding, iv, - key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_encrypt )) != kCCSuccess) + if ((status = CCCryptorCreateWithMode( kCCEncrypt, mode, kCCAlgorithmAES128, ccNoPadding, iv, key->secret, + key->secret_len, NULL, 0, 0, 0, &key->ref_encrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); return STATUS_INTERNAL_ERROR; } - if ((status = CCCryptorCreateWithMode( kCCDecrypt, kCCModeCBC, kCCAlgorithmAES128, ccNoPadding, iv, - key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_decrypt )) != kCCSuccess) + if ((status = CCCryptorCreateWithMode( kCCDecrypt, mode, kCCAlgorithmAES128, ccNoPadding, iv, key->secret, + key->secret_len, NULL, 0, 0, 0, &key->ref_decrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); CCCryptorRelease( key->ref_encrypt ); @@ -1462,12 +1510,14 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (key->mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; src = input; dst = output; while (bytes_left >= key->block_size) { if ((status = key_encrypt( key, src, key->block_size, dst, key->block_size ))) return status; + if (key->mode == MODE_ID_ECB && (status = key_set_params( key, NULL, 0 ))) return status; bytes_left -= key->block_size; src += key->block_size; dst += key->block_size; @@ -1547,14 +1597,16 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (input_len < key->block_size) return STATUS_BUFFER_TOO_SMALL; bytes_left -= key->block_size; } - else if (output_len < *ret_len) - return STATUS_BUFFER_TOO_SMALL; + else if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + + if (key->mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; src = input; dst = output; while (bytes_left >= key->block_size) { if ((status = key_decrypt( key, src, key->block_size, dst, key->block_size ))) return status; + if (key->mode == MODE_ID_ECB && (status = key_set_params( key, NULL, 0 ))) return status; bytes_left -= key->block_size; src += key->block_size; dst += key->block_size; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d38e581b85..3abbd759e9 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -469,7 +469,7 @@ static void test_aes(void) size = 0; memset(&key_lengths, 0, sizeof(key_lengths)); - ret = BCryptGetProperty(alg, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == sizeof(key_lengths), "got %u\n", size); ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); @@ -641,6 +641,19 @@ static void test_BCryptEncrypt(void) static UCHAR expected4[] = {0xe1,0x82,0xc3,0xc0,0x24,0xfb,0x86,0x85,0xf3,0xf1,0x2b,0x7d,0x09,0xb4,0x73,0x67, 0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94}; + static UCHAR expected5[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a}; + static UCHAR expected6[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x84,0x07,0x66,0xb7,0x49,0xc0,0x9b,0x49,0x74,0x28,0x8c,0x10,0xb9,0xc2,0x09,0x70}; + static UCHAR expected7[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99}; + static UCHAR expected8[] = + {0xb5,0x8a,0x10,0x64,0xd8,0xac,0xa9,0x9b,0xd9,0xb0,0x40,0x5b,0x85,0x45,0xf5,0xbb}; + static UCHAR expected9[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a}; static UCHAR expected_tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR expected_tag2[] = @@ -693,6 +706,25 @@ static void test_BCryptEncrypt(void) for (i = 0; i < 16; i++) ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + /* NULL initialization vector */ + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 16, NULL, NULL, 0, ciphertext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + todo_wine ok(!memcmp(ciphertext, expected8, sizeof(expected8)), "wrong data\n"); + + /* all zero initialization vector */ + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + memset(ivbuf, 0, sizeof(ivbuf)); + ret = pBCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(ciphertext, expected9, sizeof(expected9)), "wrong data\n"); + for (i = 0; i < 16; i++) + ok(ciphertext[i] == expected9[i], "%u: %02x != %02x\n", i, ciphertext[i], expected9[i]); + /* input size is not a multiple of block size */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); @@ -758,20 +790,20 @@ static void test_BCryptEncrypt(void) ******************/ size = 0; - ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); + ret = pBCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); - ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); + ret = pBCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); size = 0; - ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); + ret = pBCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == sizeof(tag_length), "got %u\n", size); size = 0; memset(&tag_length, 0, sizeof(tag_length)); - ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0); + ret = pBCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == sizeof(tag_length), "got %u\n", size); ok(tag_length.dwMinLength == 12, "Expected 12, got %d\n", tag_length.dwMinLength); @@ -812,6 +844,35 @@ static void test_BCryptEncrypt(void) for (i = 0; i < 16; i++) ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); + /* NULL initialization vector */ + size = 0; + memset(ciphertext, 0xff, sizeof(ciphertext)); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 32, &auth_info, NULL, 0, ciphertext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); + + /* all zero initialization vector */ + size = 0; + memset(ciphertext, 0xff, sizeof(ciphertext)); + memset(tag, 0xff, sizeof(tag)); + memset(ivbuf, 0, sizeof(ivbuf)); + ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); + /* input size is not multiple of block size */ size = 0; memcpy(ivbuf, iv, sizeof(iv)); @@ -875,6 +936,97 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + /****************** + * AES - ECB mode * + ******************/ + + ret = pBCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_ECB, sizeof(BCRYPT_CHAIN_MODE_ECB), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = 0xdeadbeef; + size = sizeof(len); + ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* initialization vector is not allowed */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + + /* input size is a multiple of block size */ + size = 0; + ret = pBCryptEncrypt(key, data, 16, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 16, NULL, NULL, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(ciphertext, expected5, sizeof(expected5)), "wrong data\n"); + for (i = 0; i < 16; i++) + ok(ciphertext[i] == expected5[i], "%u: %02x != %02x\n", i, ciphertext[i], expected5[i]); + + /* input size is not a multiple of block size */ + size = 0; + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17, "got %u\n", size); + + /* input size is not a multiple of block size, block padding set */ + size = 0; + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected6, sizeof(expected6)), "wrong data\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected6[i], "%u: %02x != %02x\n", i, ciphertext[i], expected6[i]); + + /* input size is a multiple of block size, block padding set */ + size = 0; + ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + ok(!memcmp(ciphertext, expected7, sizeof(expected7)), "wrong data\n"); + for (i = 0; i < 48; i++) + ok(ciphertext[i] == expected7[i], "%u: %02x != %02x\n", i, ciphertext[i], expected7[i]); + + /* output size too small */ + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, ciphertext, 31, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptCloseAlgorithmProvider(aes, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } @@ -909,6 +1061,13 @@ static void test_BCryptDecrypt(void) static UCHAR ciphertext4[] = {0xe1,0x82,0xc3,0xc0,0x24,0xfb,0x86,0x85,0xf3,0xf1,0x2b,0x7d,0x09,0xb4,0x73,0x67, 0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94}; + static UCHAR ciphertext5[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x84,0x07,0x66,0xb7,0x49,0xc0,0x9b,0x49,0x74,0x28,0x8c,0x10,0xb9,0xc2,0x09,0x70}; + static UCHAR ciphertext6[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99}; static UCHAR tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR tag2[] = @@ -926,7 +1085,7 @@ static void test_BCryptDecrypt(void) size = 0; memset(&key_lengths, 0, sizeof(key_lengths)); - ret = BCryptGetProperty(aes, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ret = pBCryptGetProperty(aes, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == sizeof(key_lengths), "got %u\n", size); ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); @@ -1040,7 +1199,7 @@ static void test_BCryptDecrypt(void) * AES - GCM mode * ******************/ - ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); + ret = pBCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); key = NULL; @@ -1091,6 +1250,108 @@ static void test_BCryptDecrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + /****************** + * AES - ECB mode * + ******************/ + + ret = pBCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_ECB, sizeof(BCRYPT_CHAIN_MODE_ECB), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = 0xdeadbeef; + size = sizeof(len); + ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* initialization vector is not allowed */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, ivbuf, 16, plaintext, 32, &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + /* input size is a multiple of block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected, sizeof(expected)), "wrong data\n"); + + /* test with padding smaller than block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 17, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 17, "got %u\n", size); + ok(!memcmp(plaintext, expected2, sizeof(expected2)), "wrong data\n"); + + /* test with padding of block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + size = 0; + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, plaintext, 32, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + + /* output size too small */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext4, 32, NULL, NULL, 16, plaintext, 31, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 15, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 16, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 17, "got %u\n", size); + + size = 0; + ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, plaintext, 31, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + /* input size is not a multiple of block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext4, 17, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + + /* input size is not a multiple of block size, block padding set */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext4, 17, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptCloseAlgorithmProvider(aes, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } -- 2.11.0

1 0

[PATCH] wevtapi: add stub for EvtExportLog
by Louis Lenders 23 Mar '18

23 Mar '18

Hi, this was reported here https://bugs.winehq.org/attachment.cgi?id=60824 Also mentioned by user in AppdB: https://appdb.winehq.org/objectManager.php?sClass=version&iId=29210

1 0

[PATCH] comctl32/datetime: Avoid a clang warning.
by Zhiyi Zhang 23 Mar '18

23 Mar '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/datetime.c | 1 + 1 file changed, 1 insertion(+)

3 5

[PATCH 5/5] usp10: Use heap_calloc() in usp10_language_add_feature_list().
by Henri Verbeet 23 Mar '18

23 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index b627aa2a9cd..53632714a4e 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2837,7 +2837,7 @@ static void usp10_language_add_feature_list(LoadedLanguage *language, char table loaded_feature->tableType = table_type; loaded_feature->feature = feature; loaded_feature->lookup_count = GET_BE_WORD(feature->LookupCount); - loaded_feature->lookups = heap_alloc(loaded_feature->lookup_count * sizeof(*loaded_feature->lookups)); + loaded_feature->lookups = heap_calloc(loaded_feature->lookup_count, sizeof(*loaded_feature->lookups)); for (j = 0; j < loaded_feature->lookup_count; ++j) loaded_feature->lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); } -- 2.11.0

2 1

[PATCH 4/5] wined3d: Get rid of ARB_vertex_blend support.
by Henri Verbeet 23 Mar '18

23 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 9 --- dlls/wined3d/directx.c | 19 ------ dlls/wined3d/state.c | 152 ++--------------------------------------- dlls/wined3d/wined3d_gl.h | 1 - dlls/wined3d/wined3d_private.h | 4 +- 5 files changed, 8 insertions(+), 177 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 04756be09d0..47eb42e9f71 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2144,15 +2144,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 1); checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, 1);"); - if (gl_info->supported[ARB_VERTEX_BLEND]) - { - /* Direct3D always uses n-1 weights for n world matrices and uses - * 1 - sum for the last one this is equal to GL_WEIGHT_SUM_UNITY_ARB. - * Enabling it doesn't do anything unless GL_VERTEX_BLEND_ARB isn't - * enabled as well. */ - gl_info->gl_ops.gl.p_glEnable(GL_WEIGHT_SUM_UNITY_ARB); - checkGLcall("glEnable(GL_WEIGHT_SUM_UNITY_ARB)"); - } if (gl_info->supported[NV_TEXTURE_SHADER2]) { /* Set up the previous texture input for all shader units. This applies to bump mapping, and in d3d diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f18c4ace1ac..3bd63c3c074 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -200,7 +200,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_transform_feedback3", ARB_TRANSFORM_FEEDBACK3 }, {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, - {"GL_ARB_vertex_blend", ARB_VERTEX_BLEND }, {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT }, {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM }, {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER }, @@ -2935,17 +2934,6 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetUniformBlockIndex) USE_GL_FUNC(glGetUniformIndices) USE_GL_FUNC(glUniformBlockBinding) - /* GL_ARB_vertex_blend */ - USE_GL_FUNC(glVertexBlendARB) - USE_GL_FUNC(glWeightPointerARB) - USE_GL_FUNC(glWeightbvARB) - USE_GL_FUNC(glWeightdvARB) - USE_GL_FUNC(glWeightfvARB) - USE_GL_FUNC(glWeightivARB) - USE_GL_FUNC(glWeightsvARB) - USE_GL_FUNC(glWeightubvARB) - USE_GL_FUNC(glWeightuivARB) - USE_GL_FUNC(glWeightusvARB) /* GL_ARB_vertex_buffer_object */ USE_GL_FUNC(glBindBufferARB) USE_GL_FUNC(glBufferDataARB) @@ -3464,7 +3452,6 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) GLfloat gl_floatv[2]; GLint gl_max; - gl_info->limits.blends = 1; gl_info->limits.buffers = 1; gl_info->limits.textures = 0; gl_info->limits.texture_coords = 0; @@ -3614,12 +3601,6 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.texture_coords = 1; } - if (gl_info->supported[ARB_VERTEX_BLEND]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_UNITS_ARB, &gl_max); - gl_info->limits.blends = gl_max; - TRACE("Max blends: %u.\n", gl_info->limits.blends); - } if (gl_info->supported[EXT_TEXTURE3D]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE_EXT, &gl_max); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e3c39f64e0d..83cc484be81 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3834,41 +3834,9 @@ void clipplane(struct wined3d_context *context, const struct wined3d_state *stat static void transform_worldex(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - UINT matrix = state_id - STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0)); - const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum glMat; - - TRACE("Setting world matrix %d\n", matrix); - - if (matrix >= gl_info->limits.blends) - { - WARN("Unsupported blend matrix set\n"); - return; - } - - if (isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_VIEW))) - return; + unsigned int matrix = state_id - STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0)); - /* GL_MODELVIEW0_ARB: 0x1700 - * GL_MODELVIEW1_ARB: 0x850a - * GL_MODELVIEW2_ARB: 0x8722 - * GL_MODELVIEW3_ARB: 0x8723 - * etc - * GL_MODELVIEW31_ARB: 0x873f - */ - if(matrix == 1) glMat = GL_MODELVIEW1_ARB; - else glMat = GL_MODELVIEW2_ARB - 2 + matrix; - - gl_info->gl_ops.gl.p_glMatrixMode(glMat); - checkGLcall("glMatrixMode(glMat)"); - - /* World matrix 0 is multiplied with the view matrix because d3d uses 3 - * matrices while gl uses only 2. To avoid weighting the view matrix - * incorrectly it has to be multiplied into every GL modelview matrix. */ - gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW]._11); - checkGLcall("glLoadMatrixf"); - gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(matrix)]._11); - checkGLcall("glMultMatrixf"); + WARN("Unsupported world matrix %u set.\n", matrix); } static void state_vertexblend_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -3883,50 +3851,6 @@ static void state_vertexblend_w(struct wined3d_context *context, const struct wi else WARN("Vertex blend flags %#x not supported.\n", f); } -static void state_vertexblend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - enum wined3d_vertex_blend_flags val = state->render_states[WINED3D_RS_VERTEXBLEND]; - const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_device *device = context->device; - static unsigned int once; - - switch (val) - { - case WINED3D_VBF_1WEIGHTS: - case WINED3D_VBF_2WEIGHTS: - case WINED3D_VBF_3WEIGHTS: - gl_info->gl_ops.gl.p_glEnable(GL_VERTEX_BLEND_ARB); - checkGLcall("glEnable(GL_VERTEX_BLEND_ARB)"); - - /* D3D adds one more matrix which has weight (1 - sum(weights)). - * This is enabled at context creation with enabling - * GL_WEIGHT_SUM_UNITY_ARB. */ - GL_EXTCALL(glVertexBlendARB(state->render_states[WINED3D_RS_VERTEXBLEND] + 1)); - - if (!device->vertexBlendUsed) - { - unsigned int i; - for (i = 1; i < gl_info->limits.blends; ++i) - { - if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(i)))) - transform_worldex(context, state, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(i))); - } - device->vertexBlendUsed = TRUE; - } - break; - - case WINED3D_VBF_TWEENING: - case WINED3D_VBF_0WEIGHTS: /* Indexed vertex blending, not supported. */ - if (!once++) FIXME("Vertex blend flags %#x not supported.\n", val); - else WARN("Vertex blend flags %#x not supported.\n", val); - /* Fall through. */ - case WINED3D_VBF_DISABLE: - gl_info->gl_ops.gl.p_glDisable(GL_VERTEX_BLEND_ARB); - checkGLcall("glDisable(GL_VERTEX_BLEND_ARB)"); - break; - } -} - static void transform_view(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -3977,16 +3901,6 @@ static void transform_view(struct wined3d_context *context, const struct wined3d * No need to do it here if the state is scheduled for update. */ if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0)))) transform_world(context, state, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); - - /* Avoid looping over a number of matrices if the app never used the functionality */ - if (context->device->vertexBlendUsed) - { - for (k = 1; k < gl_info->limits.blends; ++k) - { - if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(k)))) - transform_worldex(context, state, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(k))); - } - } } static void transform_projection(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4011,8 +3925,6 @@ static void unload_vertex_data(const struct wined3d_gl_info *gl_info) gl_info->gl_ops.gl.p_glDisableClientState(GL_COLOR_ARRAY); if (gl_info->supported[EXT_SECONDARY_COLOR]) gl_info->gl_ops.gl.p_glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); - if (gl_info->supported[ARB_VERTEX_BLEND]) - gl_info->gl_ops.gl.p_glDisableClientState(GL_WEIGHT_ARRAY_ARB); unload_tex_coords(gl_info); } @@ -4256,59 +4168,10 @@ static void load_vertex_data(struct wined3d_context *context, { e = &si->elements[WINED3D_FFP_BLENDWEIGHT]; - if (gl_info->supported[ARB_VERTEX_BLEND]) - { - TRACE("Blend %u %p %u\n", e->format->component_count, - e->data.addr + state->load_base_vertex_index * e->stride, e->stride); - - gl_info->gl_ops.gl.p_glEnableClientState(GL_WEIGHT_ARRAY_ARB); - checkGLcall("glEnableClientState(GL_WEIGHT_ARRAY_ARB)"); - - GL_EXTCALL(glVertexBlendARB(e->format->component_count + 1)); - - if (curVBO != e->data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, e->data.buffer_object)); - checkGLcall("glBindBuffer"); - curVBO = e->data.buffer_object; - } - - TRACE("glWeightPointerARB(%#x, %#x, %#x, %p);\n", - e->format->gl_vtx_format, - e->format->gl_vtx_type, - e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - GL_EXTCALL(glWeightPointerARB(e->format->gl_vtx_format, e->format->gl_vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride)); - - checkGLcall("glWeightPointerARB"); - - if (si->use_map & (1u << WINED3D_FFP_BLENDINDICES)) - { - static BOOL warned; - if (!warned) - { - FIXME("blendMatrixIndices support\n"); - warned = TRUE; - } - } - } - else - { - /* TODO: Support vertex blending in immediate mode draws. No need - * to write a FIXME here, this is done after the general vertex - * declaration decoding. */ - WARN("Vertex blending not supported.\n"); - } - } - else - { - if (gl_info->supported[ARB_VERTEX_BLEND]) - { - static const GLbyte one = 1; - GL_EXTCALL(glWeightbvARB(1, &one)); - checkGLcall("glWeightbvARB(gl_info->max_blends, weights)"); - } + /* TODO: Support vertex blending in immediate mode draws. No need to + * write a FIXME here, this is done after the general vertex + * declaration decoding. */ + WARN("Vertex blending not supported.\n"); } /* Point Size ----------------------------------------------*/ @@ -5605,7 +5468,6 @@ static const struct StateEntryTemplate vp_ffp_states[] = { STATE_RENDER(WINED3D_RS_SPECULARMATERIALSOURCE), { STATE_RENDER(WINED3D_RS_COLORVERTEX), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_AMBIENTMATERIALSOURCE), { STATE_RENDER(WINED3D_RS_COLORVERTEX), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EMISSIVEMATERIALSOURCE), { STATE_RENDER(WINED3D_RS_COLORVERTEX), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_VERTEXBLEND), { STATE_RENDER(WINED3D_RS_VERTEXBLEND), state_vertexblend }, ARB_VERTEX_BLEND }, { STATE_RENDER(WINED3D_RS_VERTEXBLEND), { STATE_RENDER(WINED3D_RS_VERTEXBLEND), state_vertexblend_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_POINTSIZE), { STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), { STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), state_psizemin_arb }, ARB_POINT_PARAMETERS }, @@ -5778,7 +5640,7 @@ static void vp_ffp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3 caps->xyzrhw = FALSE; caps->ffp_generic_attributes = FALSE; caps->max_active_lights = gl_info->limits.lights; - caps->max_vertex_blend_matrices = gl_info->limits.blends; + caps->max_vertex_blend_matrices = 1; caps->max_vertex_blend_matrix_index = 0; caps->vertex_processing_caps = WINED3DVTXPCAPS_DIRECTIONALLIGHTS | WINED3DVTXPCAPS_MATERIALSOURCE7 diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index ed439e2a2ca..49205f9c120 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -133,7 +133,6 @@ enum wined3d_gl_extension ARB_TRANSFORM_FEEDBACK3, ARB_UNIFORM_BUFFER_OBJECT, ARB_VERTEX_ARRAY_BGRA, - ARB_VERTEX_BLEND, ARB_VERTEX_BUFFER_OBJECT, ARB_VERTEX_PROGRAM, ARB_VERTEX_SHADER, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a28e83c97e0..080134d0340 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2531,7 +2531,6 @@ struct wined3d_gl_limits UINT texture3d_size; float pointsize_max; float pointsize_min; - UINT blends; UINT anisotropy; float shininess; UINT samples; @@ -2899,13 +2898,12 @@ struct wined3d_device APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; struct wined3d_blitter *blitter; - BYTE vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ BYTE bCursorVisible : 1; BYTE d3d_initialized : 1; BYTE inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ BYTE softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ BYTE filter_messages : 1; - BYTE padding : 2; + BYTE padding : 3; unsigned char surface_alignment; /* Line Alignment of surfaces */ -- 2.11.0

1 0

[PATCH 3/5] wined3d: Get rid of the dst_arg enum.
by Henri Verbeet 23 Mar '18

23 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 24 +++++++++++++----------- dlls/wined3d/ati_fragment_shader.c | 19 +++++++++++-------- dlls/wined3d/glsl_shader.c | 17 +++++++---------- dlls/wined3d/utils.c | 8 ++------ dlls/wined3d/wined3d_private.h | 8 +------- 5 files changed, 34 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f0586e2d3c2..2c0a46f779a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6072,17 +6072,19 @@ static const char *get_argreg(struct wined3d_string_buffer *buffer, DWORD argnum } static void gen_ffp_instr(struct wined3d_string_buffer *buffer, unsigned int stage, BOOL color, - BOOL alpha, DWORD dst, DWORD op, DWORD dw_arg0, DWORD dw_arg1, DWORD dw_arg2) + BOOL alpha, BOOL tmp_dst, DWORD op, DWORD dw_arg0, DWORD dw_arg1, DWORD dw_arg2) { const char *dstmask, *dstreg, *arg0, *arg1, *arg2; unsigned int mul = 1; - if(color && alpha) dstmask = ""; - else if(color) dstmask = ".xyz"; - else dstmask = ".w"; + if (color && alpha) + dstmask = ""; + else if (color) + dstmask = ".xyz"; + else + dstmask = ".w"; - if(dst == tempreg) dstreg = "tempreg"; - else dstreg = "ret"; + dstreg = tmp_dst ? "tempreg" : "ret"; arg0 = get_argreg(buffer, 0, stage, dw_arg0); arg1 = get_argreg(buffer, 1, stage, dw_arg1); @@ -6261,7 +6263,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if (arg0 == WINED3DTA_TEXTURE || arg1 == WINED3DTA_TEXTURE || arg2 == WINED3DTA_TEXTURE) tex_read |= 1u << stage; - if (settings->op[stage].dst == tempreg) + if (settings->op[stage].tmp_dst) tempreg_used = TRUE; if (arg0 == WINED3DTA_TEMP || arg1 == WINED3DTA_TEMP || arg2 == WINED3DTA_TEMP) tempreg_used = TRUE; @@ -6493,23 +6495,23 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if (settings->op[stage].aop == WINED3D_TOP_DISABLE) { - gen_ffp_instr(&buffer, stage, TRUE, FALSE, settings->op[stage].dst, + gen_ffp_instr(&buffer, stage, TRUE, FALSE, settings->op[stage].tmp_dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); } else if (op_equal) { - gen_ffp_instr(&buffer, stage, TRUE, TRUE, settings->op[stage].dst, + gen_ffp_instr(&buffer, stage, TRUE, TRUE, settings->op[stage].tmp_dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); } else if (settings->op[stage].cop != WINED3D_TOP_BUMPENVMAP && settings->op[stage].cop != WINED3D_TOP_BUMPENVMAP_LUMINANCE) { - gen_ffp_instr(&buffer, stage, TRUE, FALSE, settings->op[stage].dst, + gen_ffp_instr(&buffer, stage, TRUE, FALSE, settings->op[stage].tmp_dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); - gen_ffp_instr(&buffer, stage, FALSE, TRUE, settings->op[stage].dst, + gen_ffp_instr(&buffer, stage, FALSE, TRUE, settings->op[stage].tmp_dst, settings->op[stage].aop, settings->op[stage].aarg0, settings->op[stage].aarg1, settings->op[stage].aarg2); } diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 3fd4758681b..9a1cae34cd7 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -341,9 +341,8 @@ static GLuint find_tmpreg(const struct texture_stage_op op[MAX_TEXTURES]) lowest_read = i; } - if(lowest_write == -1 && op[i].dst == tempreg) { + if (lowest_write == -1 && op[i].tmp_dst) lowest_write = i; - } if(op[i].carg1 == WINED3DTA_TEXTURE || op[i].carg2 == WINED3DTA_TEXTURE || op[i].carg0 == WINED3DTA_TEXTURE || op[i].aarg1 == WINED3DTA_TEXTURE || op[i].aarg2 == WINED3DTA_TEXTURE || op[i].aarg0 == WINED3DTA_TEXTURE) { @@ -620,14 +619,18 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], break; } - if(op[stage].dst == tempreg) { - /* If we're writing to D3DTA_TEMP, but never reading from it we don't have to write there in the first place. - * skip the entire stage, this saves some GPU time - */ - if(tmparg == GL_NONE) continue; + if (op[stage].tmp_dst) + { + /* If we're writing to D3DTA_TEMP, but never reading from it we + * don't have to write there in the first place. Skip the entire + * stage, this saves some GPU time. */ + if (tmparg == GL_NONE) + continue; dstreg = tmparg; - } else { + } + else + { dstreg = GL_REG_0_ATI; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6aaee8a4af5..e920fac3907 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9116,7 +9116,7 @@ static const char *shader_glsl_get_ffp_fragment_op_arg(struct wined3d_string_buf } static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, unsigned int stage, BOOL color, - BOOL alpha, DWORD dst, DWORD op, DWORD dw_arg0, DWORD dw_arg1, DWORD dw_arg2) + BOOL alpha, BOOL tmp_dst, DWORD op, DWORD dw_arg0, DWORD dw_arg1, DWORD dw_arg2) { const char *dstmask, *dstreg, *arg0, *arg1, *arg2; @@ -9127,10 +9127,7 @@ static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, un else dstmask = ".w"; - if (dst == tempreg) - dstreg = "temp_reg"; - else - dstreg = "ret"; + dstreg = tmp_dst ? "temp_reg" : "ret"; arg0 = shader_glsl_get_ffp_fragment_op_arg(buffer, 0, stage, dw_arg0); arg1 = shader_glsl_get_ffp_fragment_op_arg(buffer, 1, stage, dw_arg1); @@ -9299,7 +9296,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * tfactor_used = TRUE; if (arg0 == WINED3DTA_TEMP || arg1 == WINED3DTA_TEMP || arg2 == WINED3DTA_TEMP) tempreg_used = TRUE; - if (settings->op[stage].dst == tempreg) + if (settings->op[stage].tmp_dst) tempreg_used = TRUE; if (arg0 == WINED3DTA_CONSTANT || arg1 == WINED3DTA_CONSTANT || arg2 == WINED3DTA_CONSTANT) tss_const_map |= 1u << stage; @@ -9665,23 +9662,23 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (settings->op[stage].aop == WINED3D_TOP_DISABLE) { - shader_glsl_ffp_fragment_op(buffer, stage, TRUE, FALSE, settings->op[stage].dst, + shader_glsl_ffp_fragment_op(buffer, stage, TRUE, FALSE, settings->op[stage].tmp_dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); } else if (op_equal) { - shader_glsl_ffp_fragment_op(buffer, stage, TRUE, TRUE, settings->op[stage].dst, + shader_glsl_ffp_fragment_op(buffer, stage, TRUE, TRUE, settings->op[stage].tmp_dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); } else if (settings->op[stage].cop != WINED3D_TOP_BUMPENVMAP && settings->op[stage].cop != WINED3D_TOP_BUMPENVMAP_LUMINANCE) { - shader_glsl_ffp_fragment_op(buffer, stage, TRUE, FALSE, settings->op[stage].dst, + shader_glsl_ffp_fragment_op(buffer, stage, TRUE, FALSE, settings->op[stage].tmp_dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); - shader_glsl_ffp_fragment_op(buffer, stage, FALSE, TRUE, settings->op[stage].dst, + shader_glsl_ffp_fragment_op(buffer, stage, FALSE, TRUE, settings->op[stage].tmp_dst, settings->op[stage].aop, settings->op[stage].aarg0, settings->op[stage].aarg1, settings->op[stage].aarg2); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7ca371b3ffc..95f26a36939 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5493,7 +5493,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d settings->op[i].carg0 = settings->op[i].carg1 = settings->op[i].carg2 = ARG_UNUSED; settings->op[i].aarg0 = settings->op[i].aarg1 = settings->op[i].aarg2 = ARG_UNUSED; settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; - settings->op[i].dst = resultreg; + settings->op[i].tmp_dst = 0; settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D; settings->op[i].projected = WINED3D_PROJECTION_NONE; i++; @@ -5638,11 +5638,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d settings->op[i].aarg0 = aarg0; settings->op[i].aarg1 = aarg1; settings->op[i].aarg2 = aarg2; - - if (state->texture_states[i][WINED3D_TSS_RESULT_ARG] == WINED3DTA_TEMP) - settings->op[i].dst = tempreg; - else - settings->op[i].dst = resultreg; + settings->op[i].tmp_dst = state->texture_states[i][WINED3D_TSS_RESULT_ARG] == WINED3DTA_TEMP; } /* Clear unsupported stages */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 12a95fdc6c5..a28e83c97e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2641,12 +2641,6 @@ enum wined3d_projection_type WINED3D_PROJECTION_COUNT4 = 2 }; -enum dst_arg -{ - resultreg = 0, - tempreg = 1 -}; - /***************************************************************************** * Fixed function pipeline replacements */ @@ -2665,7 +2659,7 @@ struct texture_stage_op struct color_fixup_desc color_fixup; unsigned tex_type : 3; - unsigned dst : 1; + unsigned tmp_dst : 1; unsigned projected : 2; unsigned padding : 10; }; -- 2.11.0

1 0

[PATCH 2/5] wined3d: use upper-case enum elements in the projection_types enum.
by Henri Verbeet 23 Mar '18

23 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 48 ++++++++++++++++++++++++++------------ dlls/wined3d/ati_fragment_shader.c | 18 ++++++-------- dlls/wined3d/glsl_shader.c | 14 +++++------ dlls/wined3d/utils.c | 10 ++++---- dlls/wined3d/wined3d_private.h | 8 +++---- 5 files changed, 56 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2f65d5c1c51..f0586e2d3c2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6379,12 +6379,17 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con textype = arbfp_texture_target(settings->op[stage].tex_type); - if(settings->op[stage].projected == proj_none) { + if (settings->op[stage].projected == WINED3D_PROJECTION_NONE) + { instr = "TEX"; - } else if(settings->op[stage].projected == proj_count4 || - settings->op[stage].projected == proj_count3) { + } + else if (settings->op[stage].projected == WINED3D_PROJECTION_COUNT4 + || settings->op[stage].projected == WINED3D_PROJECTION_COUNT3) + { instr = "TXP"; - } else { + } + else + { FIXME("Unexpected projection mode %d\n", settings->op[stage].projected); instr = "TXP"; } @@ -6398,18 +6403,27 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con shader_addline(&buffer, "SWZ arg1, bumpmat%u, y, w, 0, 0;\n", stage - 1); shader_addline(&buffer, "DP3 ret.y, arg1, tex%u;\n", stage - 1); - /* with projective textures, texbem only divides the static texture coord, not the displacement, - * so multiply the displacement with the dividing parameter before passing it to TXP - */ - if (settings->op[stage].projected != proj_none) { - if(settings->op[stage].projected == proj_count4) { + /* With projective textures, texbem only divides the static + * texture coordinate, not the displacement, so multiply the + * displacement with the dividing parameter before passing it to + * TXP. */ + if (settings->op[stage].projected != WINED3D_PROJECTION_NONE) + { + if (settings->op[stage].projected == WINED3D_PROJECTION_COUNT4) + { shader_addline(&buffer, "MOV ret.w, fragment.texcoord[%u].w;\n", stage); - shader_addline(&buffer, "MUL ret.xyz, ret, fragment.texcoord[%u].w, fragment.texcoord[%u];\n", stage, stage); - } else { + shader_addline(&buffer, "MUL ret.xyz, ret, fragment.texcoord[%u].w, fragment.texcoord[%u];\n", + stage, stage); + } + else + { shader_addline(&buffer, "MOV ret.w, fragment.texcoord[%u].z;\n", stage); - shader_addline(&buffer, "MAD ret.xyz, ret, fragment.texcoord[%u].z, fragment.texcoord[%u];\n", stage, stage); + shader_addline(&buffer, "MAD ret.xyz, ret, fragment.texcoord[%u].z, fragment.texcoord[%u];\n", + stage, stage); } - } else { + } + else + { shader_addline(&buffer, "ADD ret, ret, fragment.texcoord[%u];\n", stage); } @@ -6421,12 +6435,16 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con stage - 1, stage - 1, stage - 1); shader_addline(&buffer, "MUL tex%u, tex%u, ret.x;\n", stage, stage); } - } else if(settings->op[stage].projected == proj_count3) { + } + else if (settings->op[stage].projected == WINED3D_PROJECTION_COUNT3) + { shader_addline(&buffer, "MOV ret, fragment.texcoord[%u];\n", stage); shader_addline(&buffer, "MOV ret.w, ret.z;\n"); shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", instr, stage, stage, textype); - } else { + } + else + { shader_addline(&buffer, "%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", instr, stage, stage, stage, textype); } diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 9d6837a2f22..3fd4758681b 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -505,16 +505,13 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], TRACE("glSampleMapATI(GL_REG_%d_ATI, GL_TEXTURE_%d_ARB, GL_SWIZZLE_STR_ATI)\n", stage, stage); - GL_EXTCALL(glSampleMapATI(GL_REG_0_ATI + stage, - GL_TEXTURE0_ARB + stage, - GL_SWIZZLE_STR_ATI)); - if(op[stage + 1].projected == proj_none) { + GL_EXTCALL(glSampleMapATI(GL_REG_0_ATI + stage, GL_TEXTURE0_ARB + stage, GL_SWIZZLE_STR_ATI)); + if (op[stage + 1].projected == WINED3D_PROJECTION_NONE) swizzle = GL_SWIZZLE_STR_ATI; - } else if(op[stage + 1].projected == proj_count4) { + else if (op[stage + 1].projected == WINED3D_PROJECTION_COUNT4) swizzle = GL_SWIZZLE_STQ_DQ_ATI; - } else { + else swizzle = GL_SWIZZLE_STR_DR_ATI; - } TRACE("glPassTexCoordATI(GL_REG_%d_ATI, GL_TEXTURE_%d_ARB, %s)\n", stage + 1, stage + 1, debug_swizzle(swizzle)); GL_EXTCALL(glPassTexCoordATI(GL_REG_0_ATI + stage + 1, @@ -579,13 +576,12 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], if (op[stage].cop == WINED3D_TOP_DISABLE) break; - if(op[stage].projected == proj_none) { + if (op[stage].projected == WINED3D_PROJECTION_NONE) swizzle = GL_SWIZZLE_STR_ATI; - } else if(op[stage].projected == proj_count3) { + else if (op[stage].projected == WINED3D_PROJECTION_COUNT3) swizzle = GL_SWIZZLE_STR_DR_ATI; - } else { + else swizzle = GL_SWIZZLE_STQ_DQ_ATI; - } if (op_reads_texture(&op[stage])) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1a9886353d1..6aaee8a4af5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9495,12 +9495,12 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (!(tex_map & (1u << stage))) continue; - if (settings->op[stage].projected == proj_none) + if (settings->op[stage].projected == WINED3D_PROJECTION_NONE) { proj = FALSE; } - else if (settings->op[stage].projected == proj_count4 - || settings->op[stage].projected == proj_count3) + else if (settings->op[stage].projected == WINED3D_PROJECTION_COUNT4 + || settings->op[stage].projected == WINED3D_PROJECTION_COUNT3) { proj = TRUE; } @@ -9583,12 +9583,12 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_addline(buffer, "ret.xy = bumpenv_mat%u * tex%u.xy;\n", stage - 1, stage - 1); /* With projective textures, texbem only divides the static - * texture coord, not the displacement, so multiply the + * texture coordinate, not the displacement, so multiply the * displacement with the dividing parameter before passing it to * TXP. */ - if (settings->op[stage].projected != proj_none) + if (settings->op[stage].projected != WINED3D_PROJECTION_NONE) { - if (settings->op[stage].projected == proj_count4) + if (settings->op[stage].projected == WINED3D_PROJECTION_COUNT4) { shader_addline(buffer, "ret.xy = (ret.xy * ffp_texcoord[%u].w) + ffp_texcoord[%u].xy;\n", stage, stage); @@ -9613,7 +9613,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_addline(buffer, "tex%u *= clamp(tex%u.z * bumpenv_lum_scale%u + bumpenv_lum_offset%u, 0.0, 1.0);\n", stage, stage - 1, stage - 1, stage - 1); } - else if (settings->op[stage].projected == proj_count3) + else if (settings->op[stage].projected == WINED3D_PROJECTION_COUNT3) { shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", stage, texture_function, stage, stage); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a54e18efd9c..7ca371b3ffc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5495,7 +5495,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; settings->op[i].dst = resultreg; settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D; - settings->op[i].projected = proj_none; + settings->op[i].projected = WINED3D_PROJECTION_NONE; i++; break; } @@ -5619,15 +5619,15 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d { ttff = state->texture_states[i][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS]; if (ttff == (WINED3D_TTFF_PROJECTED | WINED3D_TTFF_COUNT3)) - settings->op[i].projected = proj_count3; + settings->op[i].projected = WINED3D_PROJECTION_COUNT3; else if (ttff & WINED3D_TTFF_PROJECTED) - settings->op[i].projected = proj_count4; + settings->op[i].projected = WINED3D_PROJECTION_COUNT4; else - settings->op[i].projected = proj_none; + settings->op[i].projected = WINED3D_PROJECTION_NONE; } else { - settings->op[i].projected = proj_none; + settings->op[i].projected = WINED3D_PROJECTION_NONE; } settings->op[i].cop = cop; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8c739aac547..12a95fdc6c5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2634,11 +2634,11 @@ BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext) DECLSPEC_HIDDEN; -enum projection_types +enum wined3d_projection_type { - proj_none = 0, - proj_count3 = 1, - proj_count4 = 2 + WINED3D_PROJECTION_NONE = 0, + WINED3D_PROJECTION_COUNT3 = 1, + WINED3D_PROJECTION_COUNT4 = 2 }; enum dst_arg -- 2.11.0

1 0

[PATCH 1/5] wined3d: Use upper-case enum elements in the vertexprocessing_mode enum.
by Henri Verbeet 23 Mar '18

23 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 125 ++++++++++++++++++-------------------- dlls/wined3d/glsl_shader.c | 10 +-- dlls/wined3d/shader.c | 8 +-- dlls/wined3d/wined3d_private.h | 11 ++-- 4 files changed, 75 insertions(+), 79 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 23f69a2b586..2f65d5c1c51 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1061,7 +1061,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction /* This is better than nothing for now */ sprintf(register_name, "fragment.texcoord[%s + %u]", rel_reg, reg->idx[0].offset); } - else if(ctx->cur_ps_args->super.vp_mode != vertexshader) + else if(ctx->cur_ps_args->super.vp_mode != WINED3D_VP_MODE_SHADER) { /* This is problematic because we'd have to consult the ctx->ps_input strings * for where to find the varying. Some may be "0.0", others can be texcoords or @@ -3415,73 +3415,68 @@ static void init_ps_input(const struct wined3d_shader *shader, const char *semantic_name; DWORD semantic_idx; - switch(args->super.vp_mode) - { - case pretransformed: - case fixedfunction: - /* The pixelshader has to collect the varyings on its own. In any case properly load - * color0 and color1. In the case of pretransformed vertices also load texcoords. Set - * other attribs to 0.0. - * - * For fixedfunction this behavior is correct, according to the tests. For pretransformed - * we'd either need a replacement shader that can load other attribs like BINORMAL, or - * load the texcoord attrib pointers to match the pixel shader signature - */ - for (i = 0; i < shader->input_signature.element_count; ++i) - { - input = &shader->input_signature.elements[i]; - if (!(semantic_name = input->semantic_name)) - continue; - semantic_idx = input->semantic_idx; + if (args->super.vp_mode == WINED3D_VP_MODE_SHADER) + { + /* That one is easy. The vertex shaders provide v0-v7 in + * fragment.texcoord and v8 and v9 in fragment.color. */ + for (i = 0; i < 8; ++i) + { + priv->ps_input[i] = texcoords[i]; + } + priv->ps_input[8] = "fragment.color.primary"; + priv->ps_input[9] = "fragment.color.secondary"; + return; + } - if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_COLOR)) - { - if (!semantic_idx) - priv->ps_input[input->register_idx] = "fragment.color.primary"; - else if (semantic_idx == 1) - priv->ps_input[input->register_idx] = "fragment.color.secondary"; - else - priv->ps_input[input->register_idx] = "0.0"; - } - else if (args->super.vp_mode == fixedfunction) - { - priv->ps_input[input->register_idx] = "0.0"; - } - else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) - { - if (semantic_idx < 8) - priv->ps_input[input->register_idx] = texcoords[semantic_idx]; - else - priv->ps_input[input->register_idx] = "0.0"; - } - else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_FOG)) - { - if (!semantic_idx) - priv->ps_input[input->register_idx] = "fragment.fogcoord"; - else - priv->ps_input[input->register_idx] = "0.0"; - } - else - { - priv->ps_input[input->register_idx] = "0.0"; - } + /* The fragment shader has to collect the varyings on its own. In any case + * properly load color0 and color1. In the case of pre-transformed + * vertices also load texture coordinates. Set other attributes to 0.0. + * + * For fixed-function this behavior is correct, according to the tests. + * For pre-transformed we'd either need a replacement shader that can load + * other attributes like BINORMAL, or load the texture coordinate + * attribute pointers to match the fragment shader signature. */ + for (i = 0; i < shader->input_signature.element_count; ++i) + { + input = &shader->input_signature.elements[i]; + if (!(semantic_name = input->semantic_name)) + continue; + semantic_idx = input->semantic_idx; - TRACE("v%u, semantic %s%u is %s\n", input->register_idx, - semantic_name, semantic_idx, priv->ps_input[input->register_idx]); - } - break; + if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_COLOR)) + { + if (!semantic_idx) + priv->ps_input[input->register_idx] = "fragment.color.primary"; + else if (semantic_idx == 1) + priv->ps_input[input->register_idx] = "fragment.color.secondary"; + else + priv->ps_input[input->register_idx] = "0.0"; + } + else if (args->super.vp_mode == WINED3D_VP_MODE_FF) + { + priv->ps_input[input->register_idx] = "0.0"; + } + else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) + { + if (semantic_idx < 8) + priv->ps_input[input->register_idx] = texcoords[semantic_idx]; + else + priv->ps_input[input->register_idx] = "0.0"; + } + else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_FOG)) + { + if (!semantic_idx) + priv->ps_input[input->register_idx] = "fragment.fogcoord"; + else + priv->ps_input[input->register_idx] = "0.0"; + } + else + { + priv->ps_input[input->register_idx] = "0.0"; + } - case vertexshader: - /* That one is easy. The vertex shaders provide v0-v7 in fragment.texcoord and v8 and v9 in - * fragment.color - */ - for(i = 0; i < 8; i++) - { - priv->ps_input[i] = texcoords[i]; - } - priv->ps_input[8] = "fragment.color.primary"; - priv->ps_input[9] = "fragment.color.secondary"; - break; + TRACE("v%u, semantic %s%u is %s\n", input->register_idx, + semantic_name, semantic_idx, priv->ps_input[input->register_idx]); } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6cc030aaa68..1a9886353d1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6735,7 +6735,7 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w semantic_idx = input->semantic_idx; shader_glsl_write_mask_to_str(input->mask, reg_mask); - if (args->vp_mode == vertexshader) + if (args->vp_mode == WINED3D_VP_MODE_SHADER) { if (input->sysval_semantic == WINED3D_SV_POSITION && !semantic_idx) { @@ -6774,7 +6774,7 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w if (args->pointsprite) shader_addline(buffer, "ps_in[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", shader->u.ps.input_reg_map[input->register_idx]); - else if (args->vp_mode == pretransformed && args->texcoords_initialized & (1u << semantic_idx)) + else if (args->vp_mode == WINED3D_VP_MODE_NONE && args->texcoords_initialized & (1u << semantic_idx)) shader_addline(buffer, "ps_in[%u]%s = %s[%u]%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, needs_legacy_glsl_syntax(gl_info) @@ -7596,7 +7596,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "uniform vec4 %s_samplerNP2Fixup[%u];\n", prefix, fixup->num_consts); } - if (version->major < 3 || args->vp_mode != vertexshader) + if (version->major < 3 || args->vp_mode != WINED3D_VP_MODE_SHADER) { shader_addline(buffer, "uniform struct\n{\n"); shader_addline(buffer, " vec4 color;\n"); @@ -7630,7 +7630,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context { unsigned int in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); - if (args->vp_mode == vertexshader && reg_maps->input_registers) + if (args->vp_mode == WINED3D_VP_MODE_SHADER && reg_maps->input_registers) shader_glsl_declare_shader_inputs(gl_info, buffer, in_count, shader->u.ps.interpolation_mode, version->major >= 4); shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); @@ -7729,7 +7729,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context "vpos = vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1);\n"); } - if (reg_maps->shader_version.major < 3 || args->vp_mode != vertexshader) + if (reg_maps->shader_version.major < 3 || args->vp_mode != WINED3D_VP_MODE_SHADER) { unsigned int i; WORD map = reg_maps->texcoord; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 66e1bbf8825..2a047fadafc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3926,16 +3926,16 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (shader->reg_maps.shader_version.major >= 3) { if (position_transformed) - args->vp_mode = pretransformed; + args->vp_mode = WINED3D_VP_MODE_NONE; else if (use_vs(state)) - args->vp_mode = vertexshader; + args->vp_mode = WINED3D_VP_MODE_SHADER; else - args->vp_mode = fixedfunction; + args->vp_mode = WINED3D_VP_MODE_FF; args->fog = WINED3D_FFP_PS_FOG_OFF; } else { - args->vp_mode = vertexshader; + args->vp_mode = WINED3D_VP_MODE_SHADER; if (state->render_states[WINED3D_RS_FOGENABLE]) { switch (state->render_states[WINED3D_RS_FOGTABLEMODE]) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 574ef46cea1..8c739aac547 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1300,10 +1300,11 @@ enum wined3d_gl_resource_type WINED3D_GL_RES_TYPE_COUNT = 7, }; -enum vertexprocessing_mode { - fixedfunction, - vertexshader, - pretransformed +enum wined3d_vertex_processing_mode +{ + WINED3D_VP_MODE_FF, + WINED3D_VP_MODE_SHADER, + WINED3D_VP_MODE_NONE, }; #define WINED3D_CONST_NUM_UNUSED ~0U @@ -1338,7 +1339,7 @@ enum wined3d_shader_tex_types struct ps_compile_args { struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; - enum vertexprocessing_mode vp_mode; + enum wined3d_vertex_processing_mode vp_mode; enum wined3d_ffp_ps_fog_mode fog; WORD tex_transform; /* ps 1.0-1.3, 4 textures */ WORD tex_types; /* ps 1.0 - 1.4, 6 textures */ -- 2.11.0

1 0

Wine Vulkan loader (vulkan-1.dll)
by Roderick Colenbrander 23 Mar '18

23 Mar '18

Hi all, Now that we have an initial Vulkan ICD, the question is how do we supply users with the Vulkan loader (vulkan-1.dll). At the moment users need to install it themselves by downloading Vulkan SDK e.g. through winetricks or lunarg website. There are a various options each with their pros and cons. 1. Use the official Vulkan loader and bundle it with Wine. The vulkan loader is open source and could thus be bundled. However last year the license switched from BSD to Apache. At some point I compiled the loader using winegcc though had to make a few code changes, which I'm sure could be upstreamed to Khronos. 2. Provide our own minimal vulkan-1.dll implementation. It would cut some corners by not supporting layers or handling of multiple ICDs, which is were most of the complexity lays. In terms of loading order we would prefer native over builtin as e.g. Steam may want to use the real loader to provide layers such as overlay. Last summer I did create such a loader, but I would need to dust it off. Most of the code is very easy to generate and would most can share some code with winevulkan e.g. dispatch structures and macros. 3. Provide vulkan loader in a wine-gecko/wine-mono kind of way through an external download. Not as user friendly and not sure how desired for Wine unit tests needing an external dependency. In an ideal world, I would prefer option 1) as it doesn't make sense to duplicate work and it also provides the most features. However, the question is whether we would want Apache 2.0 licensed code in Wine. Technically we are LGPL >= 2.1, so under 3.0 license this would be compatible (and you could offer an option to not build the dll maybe). More realistically I suppose 2) is the preferred method for now. Thoughts? Thanks, Roderick

3 3

[PATCH v2 1/2] winevulkan: add helper function for VkDeviceCreateInfo conversion.
by Roderick Colenbrander 23 Mar '18

23 Mar '18

Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> --- dlls/winevulkan/vulkan.c | 73 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a5b8a96e91..2a67a431b4 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -98,6 +98,63 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, return queues; } +/* Helper function to convert win32 VkDeviceCreateInfo to host compatible. */ +static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src, + VkDeviceCreateInfo *dst) +{ + unsigned int i; + + dst->sType = src->sType; + dst->flags = src->flags; + + /* Application and loader can pass in a chain of extensions through pNext. + * We can't blindly pass these through as often these contain callbacks or + * they can even be pass structures for loader / ICD internal use. For now + * we ignore everything in pNext chain, but we print FIXMEs. + */ + if (src->pNext) + { + const struct wine_vk_structure_header *header; + + for (header = src->pNext; header; header = header->pNext) + { + switch (header->sType) + { + case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO: + /* Used for loader to ICD communication. Ignore to not confuse + * host loader. + */ + break; + + default: + FIXME("Application requested a linked structure of type %d\n", header->sType); + } + } + } + /* For now don't support anything. */ + dst->pNext = NULL; + + dst->queueCreateInfoCount = src->queueCreateInfoCount; + dst->pQueueCreateInfos = src->pQueueCreateInfos; + + /* Should be filtered out by loader as ICDs don't support layers. */ + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + + dst->ppEnabledExtensionNames = src->ppEnabledExtensionNames; + dst->enabledExtensionCount = src->enabledExtensionCount; + + TRACE("Enabled extensions: %u\n", dst->enabledExtensionCount); + for (i = 0; i < dst->enabledExtensionCount; i++) + { + TRACE("Extension %u: %s\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); + } + + dst->pEnabledFeatures = src->pEnabledFeatures; + + return VK_SUCCESS; +} + /* Helper function used for freeing a device structure. This function supports full * and partial object cleanups and can thus be used for vkCreateDevice failures. */ @@ -470,6 +527,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, const VkAllocationCallbacks *allocator, VkDevice *device) { struct VkDevice_T *object = NULL; + VkDeviceCreateInfo create_info_host; uint32_t max_queue_families; VkResult res; unsigned int i; @@ -485,11 +543,18 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + res = wine_vk_device_convert_create_info(create_info, &create_info_host); + if (res != VK_SUCCESS) + { + ERR("Failed to convert device create info, res=%d\n", res); + goto err; + } + /* At least for now we can directly pass create_info through. All extensions we report * should be compatible. In addition the loader is supposed to sanitize values e.g. layers. */ res = phys_dev->instance->funcs.p_vkCreateDevice(phys_dev->phys_dev, - create_info, NULL /* allocator */, &object->device); + &create_info_host, NULL /* allocator */, &object->device); if (res != VK_SUCCESS) { ERR("Failed to create device\n"); @@ -524,10 +589,10 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, goto err; } - for (i = 0; i < create_info->queueCreateInfoCount; i++) + for (i = 0; i < create_info_host.queueCreateInfoCount; i++) { - uint32_t family_index = create_info->pQueueCreateInfos[i].queueFamilyIndex; - uint32_t queue_count = create_info->pQueueCreateInfos[i].queueCount; + uint32_t family_index = create_info_host.pQueueCreateInfos[i].queueFamilyIndex; + uint32_t queue_count = create_info_host.pQueueCreateInfos[i].queueCount; TRACE("queueFamilyIndex %u, queueCount %u\n", family_index, queue_count); -- 2.14.3

1 1

[v2 PATCH 3/3] bcrypt/tests: Add basic test for ecdsa.
by Alistair Leslie-Hughes 23 Mar '18

23 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/tests/bcrypt.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index a302d7d..69b3167 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -50,6 +50,8 @@ static NTSTATUS (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); static NTSTATUS (WINAPI *pBCryptImportKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptExportKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptImportKeyPair)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptVerifySignature)(BCRYPT_KEY_HANDLE, VOID *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG); static void test_BCryptGenRandom(void) { @@ -1381,6 +1383,66 @@ static void test_key_import_export(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static BYTE eccPubkey[] = +{ + /* X */ + 0x3b, 0x3c, 0x34, 0xc8, 0x3f, 0x15, 0xea, 0x02, 0x68, 0x46, 0x69, 0xdf, 0x0c, 0xa6, 0xee, 0x7a, + 0xd9, 0x82, 0x08, 0x9b, 0x37, 0x53, 0x42, 0xf3, 0x13, 0x63, 0xda, 0x65, 0x79, 0xe8, 0x04, 0x9e, + /* Y */ + 0x8c, 0x77, 0xc4, 0x33, 0x77, 0xd9, 0x5a, 0x7f, 0x60, 0x7b, 0x98, 0xce, 0xf3, 0x96, 0x56, 0xd6, + 0xb5, 0x8d, 0x87, 0x7a, 0x00, 0x2b, 0xf3, 0x70, 0xb3, 0x90, 0x73, 0xa0, 0x56, 0x06, 0x3b, 0x22, +}; +static BYTE certHash[] = +{ + 0x28, 0x19, 0x0f, 0x15, 0x6d, 0x75, 0xcc, 0xcf, 0x62, 0xf1, 0x5e, 0xe6, 0x8a, 0xc3, 0xf0, 0x5d, + 0x89, 0x28, 0x2d, 0x48, 0xd8, 0x73, 0x7c, 0x05, 0x05, 0x8e, 0xbc, 0xce, 0x28, 0xb7, 0xba, 0xc9, +}; +static BYTE certSignature[] = +{ + /* r */ + 0xd7, 0x29, 0xce, 0x5a, 0xef, 0x74, 0x85, 0xd1, 0x18, 0x5f, 0x6e, 0xf1, 0xba, 0x53, 0xd4, 0xcd, + 0xdd, 0xe0, 0x5d, 0xf1, 0x5e, 0x48, 0x51, 0xea, 0x63, 0xc0, 0xe8, 0xe2, 0xf6, 0xfa, 0x4c, 0xaf, + /* s */ + 0xe3, 0x94, 0x15, 0x3b, 0x6c, 0x71, 0x6e, 0x44, 0x22, 0xcb, 0xa0, 0x88, 0xcd, 0x0a, 0x5a, 0x50, + 0x29, 0x7c, 0x5c, 0xd6, 0x6c, 0xd2, 0xe0, 0x7f, 0xcd, 0x02, 0x92, 0x21, 0x4c, 0x2c, 0x92, 0xee, +}; + +static void test_ECDSA(void) +{ + BYTE buffer[sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPubkey)]; + BCRYPT_ECCKEY_BLOB *ecckey = (void *)buffer; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_KEY_HANDLE key = NULL; + NTSTATUS status; + + status = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); + if (status) + { + todo_wine win_skip("Failed to open ECDSA provider: %08x, skipping test\n", status); + return; + } + + ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + memcpy(ecckey + 1, eccPubkey, sizeof(eccPubkey)); + + ecckey->cbKey = 2; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->cbKey = sizeof(eccPubkey) / 2; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + ok(!status, "BCryptImportKeyPair failed: %08x\n", status); + + status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); + ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); + + status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); + ok(!status, "BCryptVerifySignature failed: %08x\n", status); + + pBCryptDestroyKey(key); + pBCryptCloseAlgorithmProvider(alg, 0); +} + START_TEST(bcrypt) { HMODULE module; @@ -1411,6 +1473,8 @@ START_TEST(bcrypt) pBCryptDestroyKey = (void *)GetProcAddress(module, "BCryptDestroyKey"); pBCryptImportKey = (void *)GetProcAddress(module, "BCryptImportKey"); pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey"); + pBCryptImportKeyPair = (void *)GetProcAddress(module, "BCryptImportKeyPair"); + pBCryptVerifySignature = (void *)GetProcAddress(module, "BCryptVerifySignature"); test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); @@ -1421,6 +1485,7 @@ START_TEST(bcrypt) test_BCryptEncrypt(); test_BCryptDecrypt(); test_key_import_export(); + test_ECDSA(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); -- 1.9.1

1 0

[v2 PATCH 2/3] bcrypt: Add support for 192 and 256 bit aes keys.
by Alistair Leslie-Hughes 23 Mar '18

23 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 14 ++++++++++++-- dlls/bcrypt/tests/bcrypt.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c66090d..17db4d3 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1003,11 +1003,21 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) WARN( "handle block size\n" ); switch (key->mode) { - case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_GCM: + if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_GCM; + if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_GCM; + break; case MODE_ID_ECB: /* can be emulated with CBC + empty IV */ case MODE_ID_CBC: - default: return GNUTLS_CIPHER_AES_128_CBC; + if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_CBC; + if (key->secret_len == 24) return GNUTLS_CIPHER_AES_192_CBC; + if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_CBC; + break; + default: + break; } + FIXME( "aes mode %u with key length %u not supported\n", key->mode, key->secret_len ); + return GNUTLS_CIPHER_UNKNOWN; default: FIXME( "algorithm %u not supported\n", key->alg_id ); return GNUTLS_CIPHER_UNKNOWN; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index cc1b27a..a302d7d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -622,6 +622,9 @@ static void test_BCryptEncrypt(void) {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; static UCHAR secret[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR secret256[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, + 0x0f,0x0e,0x0d,0x0c,0x0b,0x0a,0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00}; static UCHAR iv[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; static UCHAR data[] = @@ -650,6 +653,10 @@ static void test_BCryptEncrypt(void) {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99, 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99}; + static UCHAR expected8[] = + {0x66,0xb8,0xbd,0xe5,0x90,0x6c,0xec,0xdf,0xfa,0x8a,0xb2,0xfd,0x92,0x84,0xeb,0xf0, + 0x95,0xc4,0xdf,0xa7,0x7a,0x62,0xe4,0xab,0xd4,0x0e,0x94,0x4e,0xd7,0x6e,0xa1,0x47, + 0x29,0x4b,0x37,0xfe,0x28,0x6d,0x5f,0x69,0x46,0x30,0x73,0xc0,0xaa,0x42,0xe4,0x46}; static UCHAR expected_tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR expected_tag2[] = @@ -762,6 +769,31 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + /* 256 bit key */ + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret256, sizeof(secret256), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + ok(!memcmp(ciphertext, expected8, sizeof(expected8)), "wrong data\n"); + for (i = 0; i < 48; i++) + ok(ciphertext[i] == expected8[i], "%u: %02x != %02x\n", i, ciphertext[i], expected8[i]); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + /****************** * AES - GCM mode * ******************/ -- 1.9.1

1 0

[v2 PATCH 1/3] bcrypt: Implement support for ECB chain mode.
by Alistair Leslie-Hughes 23 Mar '18

23 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 43 +++++++-- dlls/bcrypt/tests/bcrypt.c | 211 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 244 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index e05e94c..c66090d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -225,6 +225,7 @@ enum alg_id enum mode_id { + MODE_ID_ECB, MODE_ID_CBC, MODE_ID_GCM }; @@ -574,8 +575,9 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop const WCHAR *mode; switch (alg->mode) { - case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; + case MODE_ID_ECB: mode = BCRYPT_CHAIN_MODE_ECB; break; case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; + case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; default: return STATUS_NOT_IMPLEMENTED; } @@ -628,7 +630,12 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA case ALG_ID_AES: if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + { + alg->mode = MODE_ID_ECB; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) { alg->mode = MODE_ID_CBC; return STATUS_SUCCESS; @@ -962,7 +969,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val { if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + { + key->mode = MODE_ID_ECB; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) { key->mode = MODE_ID_CBC; return STATUS_SUCCESS; @@ -992,6 +1004,7 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) switch (key->mode) { case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_ECB: /* can be emulated with CBC + empty IV */ case MODE_ID_CBC: default: return GNUTLS_CIPHER_AES_128_CBC; } @@ -1003,6 +1016,7 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { + static const UCHAR zero_iv[16]; gnutls_cipher_algorithm_t cipher; gnutls_datum_t secret, vector; int ret; @@ -1016,15 +1030,18 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) if ((cipher = get_gnutls_cipher( key )) == GNUTLS_CIPHER_UNKNOWN) return STATUS_NOT_SUPPORTED; - secret.data = key->secret; - secret.size = key->secret_len; - if (iv) + if (!iv) { - vector.data = iv; - vector.size = iv_len; + iv = (UCHAR *)zero_iv; + iv_len = sizeof(zero_iv); } - if ((ret = pgnutls_cipher_init( &key->handle, cipher, &secret, iv ? &vector : NULL ))) + secret.data = key->secret; + secret.size = key->secret_len; + vector.data = iv; + vector.size = iv_len; + + if ((ret = pgnutls_cipher_init( &key->handle, cipher, &secret, &vector ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1463,11 +1480,15 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (key->mode == MODE_ID_ECB && iv) + return STATUS_INVALID_PARAMETER; + src = input; dst = output; while (bytes_left >= key->block_size) { if ((status = key_encrypt( key, src, key->block_size, dst, key->block_size ))) return status; + if (key->mode == MODE_ID_ECB && (status = key_set_params( key, iv, iv_len ))) return status; bytes_left -= key->block_size; src += key->block_size; dst += key->block_size; @@ -1550,11 +1571,15 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp else if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (key->mode == MODE_ID_ECB && iv) + return STATUS_INVALID_PARAMETER; + src = input; dst = output; while (bytes_left >= key->block_size) { if ((status = key_decrypt( key, src, key->block_size, dst, key->block_size ))) return status; + if (key->mode == MODE_ID_ECB && (status = key_set_params( key, iv, iv_len ))) return status; bytes_left -= key->block_size; src += key->block_size; dst += key->block_size; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d38e581..cc1b27a 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -641,6 +641,15 @@ static void test_BCryptEncrypt(void) static UCHAR expected4[] = {0xe1,0x82,0xc3,0xc0,0x24,0xfb,0x86,0x85,0xf3,0xf1,0x2b,0x7d,0x09,0xb4,0x73,0x67, 0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94}; + static UCHAR expected5[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a}; + static UCHAR expected6[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x84,0x07,0x66,0xb7,0x49,0xc0,0x9b,0x49,0x74,0x28,0x8c,0x10,0xb9,0xc2,0x09,0x70}; + static UCHAR expected7[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99}; static UCHAR expected_tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR expected_tag2[] = @@ -875,6 +884,97 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + /****************** + * AES - ECB mode * + ******************/ + + ret = pBCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_ECB, sizeof(BCRYPT_CHAIN_MODE_ECB), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = 0xdeadbeef; + size = sizeof(len); + ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* initialization vector is not allowed */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + + /* input size is a multiple of block size */ + size = 0; + ret = pBCryptEncrypt(key, data, 16, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 16, NULL, NULL, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(ciphertext, expected5, sizeof(expected5)), "wrong data\n"); + for (i = 0; i < 16; i++) + ok(ciphertext[i] == expected5[i], "%u: %02x != %02x\n", i, ciphertext[i], expected5[i]); + + /* input size is not a multiple of block size */ + size = 0; + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17, "got %u\n", size); + + /* input size is not a multiple of block size, block padding set */ + size = 0; + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected6, sizeof(expected6)), "wrong data\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected6[i], "%u: %02x != %02x\n", i, ciphertext[i], expected6[i]); + + /* input size is a multiple of block size, block padding set */ + size = 0; + ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + ok(!memcmp(ciphertext, expected7, sizeof(expected7)), "wrong data\n"); + for (i = 0; i < 48; i++) + ok(ciphertext[i] == expected7[i], "%u: %02x != %02x\n", i, ciphertext[i], expected7[i]); + + /* output size too small */ + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, ciphertext, 31, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptCloseAlgorithmProvider(aes, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } @@ -909,6 +1009,13 @@ static void test_BCryptDecrypt(void) static UCHAR ciphertext4[] = {0xe1,0x82,0xc3,0xc0,0x24,0xfb,0x86,0x85,0xf3,0xf1,0x2b,0x7d,0x09,0xb4,0x73,0x67, 0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94}; + static UCHAR ciphertext5[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x84,0x07,0x66,0xb7,0x49,0xc0,0x9b,0x49,0x74,0x28,0x8c,0x10,0xb9,0xc2,0x09,0x70}; + static UCHAR ciphertext6[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99}; static UCHAR tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR tag2[] = @@ -1040,7 +1147,7 @@ static void test_BCryptDecrypt(void) * AES - GCM mode * ******************/ - ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); + ret = pBCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); key = NULL; @@ -1091,6 +1198,108 @@ static void test_BCryptDecrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + /****************** + * AES - ECB mode * + ******************/ + + ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_ECB, sizeof(BCRYPT_CHAIN_MODE_ECB), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = 0xdeadbeef; + size = sizeof(len); + ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* initialization vector is not allowed */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, ivbuf, 16, plaintext, 32, &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + /* input size is a multiple of block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected, sizeof(expected)), "wrong data\n"); + + /* test with padding smaller than block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 17, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 17, "got %u\n", size); + ok(!memcmp(plaintext, expected2, sizeof(expected2)), "wrong data\n"); + + /* test with padding of block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + size = 0; + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, plaintext, 32, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + + /* output size too small */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext4, 32, NULL, NULL, 16, plaintext, 31, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 15, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 16, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 17, "got %u\n", size); + + size = 0; + ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, plaintext, 31, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + /* input size is not a multiple of block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext4, 17, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + + /* input size is not a multiple of block size, block padding set */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext4, 17, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptCloseAlgorithmProvider(aes, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } -- 1.9.1

1 0

[PATCH 3/3] bcrypt/tests: Add basic test for ecdsa.
by Alistair Leslie-Hughes 23 Mar '18

23 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/tests/bcrypt.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5dc3c6e..a262251 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -50,6 +50,8 @@ static NTSTATUS (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); static NTSTATUS (WINAPI *pBCryptImportKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptExportKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptImportKeyPair)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptVerifySignature)(BCRYPT_KEY_HANDLE, VOID *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG); static void test_BCryptGenRandom(void) { @@ -1382,6 +1384,66 @@ static void test_key_import_export(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static BYTE eccPubkey[] = +{ + /* X */ + 0x3b, 0x3c, 0x34, 0xc8, 0x3f, 0x15, 0xea, 0x02, 0x68, 0x46, 0x69, 0xdf, 0x0c, 0xa6, 0xee, 0x7a, + 0xd9, 0x82, 0x08, 0x9b, 0x37, 0x53, 0x42, 0xf3, 0x13, 0x63, 0xda, 0x65, 0x79, 0xe8, 0x04, 0x9e, + /* Y */ + 0x8c, 0x77, 0xc4, 0x33, 0x77, 0xd9, 0x5a, 0x7f, 0x60, 0x7b, 0x98, 0xce, 0xf3, 0x96, 0x56, 0xd6, + 0xb5, 0x8d, 0x87, 0x7a, 0x00, 0x2b, 0xf3, 0x70, 0xb3, 0x90, 0x73, 0xa0, 0x56, 0x06, 0x3b, 0x22, +}; +static BYTE certHash[] = +{ + 0x28, 0x19, 0x0f, 0x15, 0x6d, 0x75, 0xcc, 0xcf, 0x62, 0xf1, 0x5e, 0xe6, 0x8a, 0xc3, 0xf0, 0x5d, + 0x89, 0x28, 0x2d, 0x48, 0xd8, 0x73, 0x7c, 0x05, 0x05, 0x8e, 0xbc, 0xce, 0x28, 0xb7, 0xba, 0xc9, +}; +static BYTE certSignature[] = +{ + /* r */ + 0xd7, 0x29, 0xce, 0x5a, 0xef, 0x74, 0x85, 0xd1, 0x18, 0x5f, 0x6e, 0xf1, 0xba, 0x53, 0xd4, 0xcd, + 0xdd, 0xe0, 0x5d, 0xf1, 0x5e, 0x48, 0x51, 0xea, 0x63, 0xc0, 0xe8, 0xe2, 0xf6, 0xfa, 0x4c, 0xaf, + /* s */ + 0xe3, 0x94, 0x15, 0x3b, 0x6c, 0x71, 0x6e, 0x44, 0x22, 0xcb, 0xa0, 0x88, 0xcd, 0x0a, 0x5a, 0x50, + 0x29, 0x7c, 0x5c, 0xd6, 0x6c, 0xd2, 0xe0, 0x7f, 0xcd, 0x02, 0x92, 0x21, 0x4c, 0x2c, 0x92, 0xee, +}; + +static void test_ECDSA(void) +{ + BYTE buffer[sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPubkey)]; + BCRYPT_ECCKEY_BLOB *ecckey = (void *)buffer; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_KEY_HANDLE key = NULL; + NTSTATUS status; + + status = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); + if (status) + { + todo_wine win_skip("Failed to open ECDSA provider: %08x, skipping test\n", status); + return; + } + + ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + memcpy(ecckey + 1, eccPubkey, sizeof(eccPubkey)); + + ecckey->cbKey = 2; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->cbKey = sizeof(eccPubkey) / 2; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + ok(!status, "BCryptImportKeyPair failed: %08x\n", status); + + status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); + ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", status); + + status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); + ok(!status, "BCryptVerifySignature failed: %08x\n", status); + + pBCryptDestroyKey(key); + pBCryptCloseAlgorithmProvider(alg, 0); +} + START_TEST(bcrypt) { HMODULE module; @@ -1412,6 +1474,8 @@ START_TEST(bcrypt) pBCryptDestroyKey = (void *)GetProcAddress(module, "BCryptDestroyKey"); pBCryptImportKey = (void *)GetProcAddress(module, "BCryptImportKey"); pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey"); + pBCryptImportKeyPair = (void *)GetProcAddress(module, "BCryptImportKeyPair"); + pBCryptVerifySignature = (void *)GetProcAddress(module, "BCryptVerifySignature"); test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); @@ -1422,6 +1486,7 @@ START_TEST(bcrypt) test_BCryptEncrypt(); test_BCryptDecrypt(); test_key_import_export(); + test_ECDSA(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); -- 1.9.1

2 1

[PATCH 2/3] bcrypt: Add support for 192 and 256 bit aes keys.
by Alistair Leslie-Hughes 23 Mar '18

23 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 14 ++++++++++++-- dlls/bcrypt/tests/bcrypt.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c66090d..17db4d3 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1003,11 +1003,21 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) WARN( "handle block size\n" ); switch (key->mode) { - case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_GCM: + if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_GCM; + if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_GCM; + break; case MODE_ID_ECB: /* can be emulated with CBC + empty IV */ case MODE_ID_CBC: - default: return GNUTLS_CIPHER_AES_128_CBC; + if (key->secret_len == 16) return GNUTLS_CIPHER_AES_128_CBC; + if (key->secret_len == 24) return GNUTLS_CIPHER_AES_192_CBC; + if (key->secret_len == 32) return GNUTLS_CIPHER_AES_256_CBC; + break; + default: + break; } + FIXME( "aes mode %u with key length %u not supported\n", key->mode, key->secret_len ); + return GNUTLS_CIPHER_UNKNOWN; default: FIXME( "algorithm %u not supported\n", key->alg_id ); return GNUTLS_CIPHER_UNKNOWN; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 9d4b976..5dc3c6e 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -622,6 +622,9 @@ static void test_BCryptEncrypt(void) {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; static UCHAR secret[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR secret256[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, + 0x0f,0x0e,0x0d,0x0c,0x0b,0x0a,0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00}; static UCHAR iv[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; static UCHAR data[] = @@ -650,6 +653,10 @@ static void test_BCryptEncrypt(void) {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99, 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99}; + static UCHAR expected8[] = + {0x66,0xb8,0xbd,0xe5,0x90,0x6c,0xec,0xdf,0xfa,0x8a,0xb2,0xfd,0x92,0x84,0xeb,0xf0, + 0x95,0xc4,0xdf,0xa7,0x7a,0x62,0xe4,0xab,0xd4,0x0e,0x94,0x4e,0xd7,0x6e,0xa1,0x47, + 0x29,0x4b,0x37,0xfe,0x28,0x6d,0x5f,0x69,0x46,0x30,0x73,0xc0,0xaa,0x42,0xe4,0x46}; static UCHAR expected_tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR expected_tag2[] = @@ -762,6 +769,31 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + /* 256 bit key */ + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret256, sizeof(secret256), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data2, 32, NULL, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + ok(!memcmp(ciphertext, expected8, sizeof(expected8)), "wrong data\n"); + for (i = 0; i < 48; i++) + ok(ciphertext[i] == expected8[i], "%u: %02x != %02x\n", i, ciphertext[i], expected8[i]); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + /****************** * AES - GCM mode * ******************/ -- 1.9.1

2 1

[PATCH 1/3] bcrypt: Implement support for ECB chain mode.
by Alistair Leslie-Hughes 23 Mar '18

23 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 43 ++++++++-- dlls/bcrypt/tests/bcrypt.c | 210 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 244 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index e05e94c..c66090d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -225,6 +225,7 @@ enum alg_id enum mode_id { + MODE_ID_ECB, MODE_ID_CBC, MODE_ID_GCM }; @@ -574,8 +575,9 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop const WCHAR *mode; switch (alg->mode) { - case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; + case MODE_ID_ECB: mode = BCRYPT_CHAIN_MODE_ECB; break; case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; + case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; default: return STATUS_NOT_IMPLEMENTED; } @@ -628,7 +630,12 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA case ALG_ID_AES: if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + { + alg->mode = MODE_ID_ECB; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) { alg->mode = MODE_ID_CBC; return STATUS_SUCCESS; @@ -962,7 +969,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val { if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + { + key->mode = MODE_ID_ECB; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) { key->mode = MODE_ID_CBC; return STATUS_SUCCESS; @@ -992,6 +1004,7 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) switch (key->mode) { case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_ECB: /* can be emulated with CBC + empty IV */ case MODE_ID_CBC: default: return GNUTLS_CIPHER_AES_128_CBC; } @@ -1003,6 +1016,7 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { + static const UCHAR zero_iv[16]; gnutls_cipher_algorithm_t cipher; gnutls_datum_t secret, vector; int ret; @@ -1016,15 +1030,18 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) if ((cipher = get_gnutls_cipher( key )) == GNUTLS_CIPHER_UNKNOWN) return STATUS_NOT_SUPPORTED; - secret.data = key->secret; - secret.size = key->secret_len; - if (iv) + if (!iv) { - vector.data = iv; - vector.size = iv_len; + iv = (UCHAR *)zero_iv; + iv_len = sizeof(zero_iv); } - if ((ret = pgnutls_cipher_init( &key->handle, cipher, &secret, iv ? &vector : NULL ))) + secret.data = key->secret; + secret.size = key->secret_len; + vector.data = iv; + vector.size = iv_len; + + if ((ret = pgnutls_cipher_init( &key->handle, cipher, &secret, &vector ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1463,11 +1480,15 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (key->mode == MODE_ID_ECB && iv) + return STATUS_INVALID_PARAMETER; + src = input; dst = output; while (bytes_left >= key->block_size) { if ((status = key_encrypt( key, src, key->block_size, dst, key->block_size ))) return status; + if (key->mode == MODE_ID_ECB && (status = key_set_params( key, iv, iv_len ))) return status; bytes_left -= key->block_size; src += key->block_size; dst += key->block_size; @@ -1550,11 +1571,15 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp else if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (key->mode == MODE_ID_ECB && iv) + return STATUS_INVALID_PARAMETER; + src = input; dst = output; while (bytes_left >= key->block_size) { if ((status = key_decrypt( key, src, key->block_size, dst, key->block_size ))) return status; + if (key->mode == MODE_ID_ECB && (status = key_set_params( key, iv, iv_len ))) return status; bytes_left -= key->block_size; src += key->block_size; dst += key->block_size; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d38e581..9d4b976 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -641,6 +641,15 @@ static void test_BCryptEncrypt(void) static UCHAR expected4[] = {0xe1,0x82,0xc3,0xc0,0x24,0xfb,0x86,0x85,0xf3,0xf1,0x2b,0x7d,0x09,0xb4,0x73,0x67, 0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94}; + static UCHAR expected5[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a}; + static UCHAR expected6[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x84,0x07,0x66,0xb7,0x49,0xc0,0x9b,0x49,0x74,0x28,0x8c,0x10,0xb9,0xc2,0x09,0x70}; + static UCHAR expected7[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99}; static UCHAR expected_tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR expected_tag2[] = @@ -875,6 +884,97 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + /****************** + * AES - ECB mode * + ******************/ + + ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_ECB, sizeof(BCRYPT_CHAIN_MODE_ECB), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = 0xdeadbeef; + size = sizeof(len); + ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* initialization vector is not allowed */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + + /* input size is a multiple of block size */ + size = 0; + ret = pBCryptEncrypt(key, data, 16, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 16, NULL, NULL, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(ciphertext, expected5, sizeof(expected5)), "wrong data\n"); + for (i = 0; i < 16; i++) + ok(ciphertext[i] == expected5[i], "%u: %02x != %02x\n", i, ciphertext[i], expected5[i]); + + /* input size is not a multiple of block size */ + size = 0; + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17, "got %u\n", size); + + /* input size is not a multiple of block size, block padding set */ + size = 0; + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected6, sizeof(expected6)), "wrong data\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected6[i], "%u: %02x != %02x\n", i, ciphertext[i], expected6[i]); + + /* input size is a multiple of block size, block padding set */ + size = 0; + ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + ok(!memcmp(ciphertext, expected7, sizeof(expected7)), "wrong data\n"); + for (i = 0; i < 48; i++) + ok(ciphertext[i] == expected7[i], "%u: %02x != %02x\n", i, ciphertext[i], expected7[i]); + + /* output size too small */ + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, ciphertext, 31, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptCloseAlgorithmProvider(aes, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } @@ -909,6 +1009,13 @@ static void test_BCryptDecrypt(void) static UCHAR ciphertext4[] = {0xe1,0x82,0xc3,0xc0,0x24,0xfb,0x86,0x85,0xf3,0xf1,0x2b,0x7d,0x09,0xb4,0x73,0x67, 0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94}; + static UCHAR ciphertext5[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x84,0x07,0x66,0xb7,0x49,0xc0,0x9b,0x49,0x74,0x28,0x8c,0x10,0xb9,0xc2,0x09,0x70}; + static UCHAR ciphertext6[] = + {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99, + 0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99}; static UCHAR tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR tag2[] = @@ -1091,6 +1198,109 @@ static void test_BCryptDecrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + /****************** + * AES - ECB mode * + ******************/ + + ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_ECB, sizeof(BCRYPT_CHAIN_MODE_ECB), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = 0xdeadbeef; + size = sizeof(len); + ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* initialization vector is not allowed */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, ivbuf, 16, plaintext, 32, &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + /* input size is a multiple of block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected, sizeof(expected)), "wrong data\n"); + + /* test with padding smaller than block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 17, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 17, "got %u\n", size); + ok(!memcmp(plaintext, expected2, sizeof(expected2)), "wrong data\n"); + + /* test with padding of block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + size = 0; + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, plaintext, 32, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + + /* output size too small */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext4, 32, NULL, NULL, 16, plaintext, 31, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 15, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 16, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 17, "got %u\n", size); + + size = 0; + ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, plaintext, 31, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 48, "got %u\n", size); + + /* input size is not a multiple of block size */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext4, 17, NULL, NULL, 16, NULL, 0, &size, 0); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + + /* input size is not a multiple of block size, block padding set */ + size = 0; + ret = pBCryptDecrypt(key, ciphertext4, 17, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptCloseAlgorithmProvider(aes, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } -- 1.9.1

2 1

[PATCH] testbot: Standardize some pushes.
by Francois Gouget 23 Mar '18

23 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 16 ++++++++-------- testbot/web/Feedback.pl | 2 +- testbot/web/ForgotPassword.pl | 2 +- testbot/web/Login.pl | 2 +- testbot/web/ResetPassword.pl | 2 +- testbot/web/Submit.pl | 8 ++++---- testbot/web/admin/Log.pl | 2 +- testbot/web/admin/UserDetails.pl | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index a508f666f..0016e19c6 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -198,7 +198,7 @@ sub LoadCollection($$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } my $Filters = $Collection->GetFilters(); @@ -299,11 +299,11 @@ sub LoadItem($$$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), "", $Where); - push(@Data, $Collection->SplitKey($RequestedKey)); + push @Data, $Collection->SplitKey($RequestedKey); my $Query = "SELECT $Fields FROM " . $Collection->GetTableName(); if ($Where ne "") @@ -378,7 +378,7 @@ sub GetInsertData($$$) my @Data; if (defined($MasterColValues)) { - push(@Data, @$MasterColValues); + push @Data, @$MasterColValues; } foreach my $PropertyDescriptor (@{$Item->GetPropertyDescriptors()}) @@ -442,7 +442,7 @@ sub GetUpdateData($$$) if (defined($MasterColValues)) { - push(@Data, @$MasterColValues); + push @Data, @$MasterColValues; } foreach my $PropertyDescriptor (@{$Item->GetPropertyDescriptors()}) @@ -550,11 +550,11 @@ sub DeleteItem($$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), "", $Where); - push(@Data, $Item->GetKeyComponents()); + push @Data, $Item->GetKeyComponents(); my $Statement = $self->GetDb()->prepare("DELETE FROM " . $Item->GetTableName() . @@ -575,7 +575,7 @@ sub DeleteAll($$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } my $Query = "DELETE FROM " . $Collection->GetTableName(); diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index ded705a1e..2480243d4 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -68,7 +68,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Send"); + push @$Actions, "Send"; return $Actions; } diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index c6240e7d3..3c94c27e8 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -61,7 +61,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Reset password"); + push @$Actions, "Reset password"; return $Actions; } diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index f17d60ed5..b5b63651e 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -89,7 +89,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Log in"); + push @$Actions, "Log in"; return $Actions; } diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 431a4da07..db129dbf2 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -75,7 +75,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Change password"); + push @$Actions, "Change password"; return $Actions; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 875384ea3..9bf17814f 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -358,19 +358,19 @@ sub GetActions($) my $Actions = $self->SUPER::GetActions(); if ($self->{Page} == 1) { - push(@$Actions, "Next >"); + push @$Actions, "Next >"; } elsif ($self->{Page} == 2) { - push(@$Actions, "< Prev", "Next >"); + push @$Actions, "< Prev", "Next >"; } elsif ($self->{Page} == 3) { - push(@$Actions, "< Prev", "Submit"); + push @$Actions, "< Prev", "Submit"; } elsif ($self->{Page} == 4) { - push(@$Actions, "OK"); + push @$Actions, "OK"; } return $Actions; diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index b9754bd31..3ad35a476 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -59,7 +59,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Download"); + push @$Actions, "Download"; return $Actions; } diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index d24e67598..28eb4b5ca 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -61,7 +61,7 @@ sub GetActions($) push @Actions, "Reject" if ($self->{Item}->Name); } - push(@Actions, @{$self->SUPER::GetActions()}); + push @Actions, @{$self->SUPER::GetActions()}; return \@Actions; } -- 2.16.2

1 0

[PATCH] testbot: Standardize on push to append to an array.
by Francois Gouget 23 Mar '18

23 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 6 +++--- testbot/bin/WineSendLog.pl | 4 ++-- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- testbot/lib/ObjectModel/CGI/ItemPage.pm | 3 +-- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 +++++----- testbot/lib/ObjectModel/Item.pm | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a03fa06b9..f39ec5fa7 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -813,9 +813,9 @@ sub main() { if (PrepareSocket($NewClientSocket)) { - $Clients[@Clients] = {Socket => $NewClientSocket, - InBuf => "", - OutBuf => ""}; + push @Clients, {Socket => $NewClientSocket, + InBuf => "", + OutBuf => ""}; } else { diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index ec9a587b5..2a8942701 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -106,13 +106,13 @@ sub ReadLog($$$) { if ($Line =~ m/${BaseName}:${TestSet} done $258$/) { - $Messages[@Messages] = "The test timed out"; + push @Messages, "The test timed out"; } $Found = 1; } else { - $Messages[@Messages] = $Line; + push @Messages, $Line; } } } diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 572355432..ca2c6d3e1 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -373,7 +373,7 @@ sub GetActions($) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - $Actions[@Actions] = 'Cancel'; + push @Actions, "Cancel"; } return \@Actions; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 74ce14e32..4086a9385 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -116,8 +116,7 @@ sub GetActions($) my ($self) = @_; my @Actions = @{$self->SUPER::GetActions()}; - $Actions[@Actions] = "OK"; - $Actions[@Actions] = "Cancel"; + push @Actions, "OK", "Cancel"; return \@Actions; } diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 60e68d8fc..a508f666f 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -385,8 +385,8 @@ sub GetInsertData($$$) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $Data[@Data] = $self->ToDb($Item->GetColValue($ColName), - $PropertyDescriptor); + push @Data, $self->ToDb($Item->GetColValue($ColName), + $PropertyDescriptor); } } @@ -434,8 +434,8 @@ sub GetUpdateData($$$) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $Data[@Data] = $self->ToDb($Item->GetColValue($ColName), - $PropertyDescriptor); + push @Data, $self->ToDb($Item->GetColValue($ColName), + $PropertyDescriptor); } } } @@ -451,7 +451,7 @@ sub GetUpdateData($$$) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $Data[@Data] = $Item->GetColValue($ColName); + push @Data, $Item->GetColValue($ColName); } } } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index e90ebbe74..424826f23 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -386,7 +386,7 @@ sub GetKeyComponents($) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $KeyComponents[@KeyComponents] = $self->{ColValues}{$ColName}; + push @KeyComponents, $self->{ColValues}{$ColName}; } } } -- 2.16.2

1 0

[PATCH 2/2 v2] msvcrt: Add _strupr tests
by Piotr Caban 22 Mar '18

22 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)

1 0

[PATCH 1/2 v2] msvcrt: Optimize _strupr implementation in C locale
by Piotr Caban 22 Mar '18

22 Mar '18

Don't write to input buffer when there's nothing to change (for bug 39979). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fixed win_skip message dlls/msvcrt/string.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)

1 0

[PATCH 2/2] msvcrt: Add _strupr tests
by Piotr Caban 22 Mar '18

22 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)

1 0

[PATCH 1/2] msvcrt: Optimize _strupr implementation in C locale
by Piotr Caban 22 Mar '18

22 Mar '18

Don't write to input buffer when there's nothing to change (for bug 39979). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)

1 0

[PATCH] iphlpapi: Add support for ConvertLengthToIpv4Mask()
by Dagfinn Reiakvam 22 Mar '18

22 Mar '18

From: Uberdaff <dagfinn(a)reiakvam.no> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 19 +++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 46 ++++++++++++++++++++++++++++++++++++++++++ include/netioapi.h | 1 + 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index b6c9aef..bbd1ed8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -23,7 +23,7 @@ @ stdcall ConvertInterfaceNameToLuidW( wstr ptr ) #@ stub ConvertInterfacePhysicalAddressToLuid #@ stub ConvertIpv4MaskToLength -#@ stub ConvertLengthToIpv4Mask +@ stdcall ConvertLengthToIpv4Mask( long ptr ) #@ stub ConvertRemoteInterfaceAliasToLuid #@ stub ConvertRemoteInterfaceGuidToLuid #@ stub ConvertRemoteInterfaceIndexToLuid diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 97284ed..8a96236 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,6 +3223,25 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) } /****************************************************************** + * ConvertLengthToIpv4Mask (IPHLPAPI.@) + */ +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG MaskLength, PULONG Mask) +{ + if(MaskLength > 32) + { + *Mask = INADDR_NONE; + return ERROR_INVALID_PARAMETER; + } + + if(MaskLength == 0) + *Mask = 0; + else + *Mask = 0xffffffff << ( 32 - MaskLength); + + return NO_ERROR; +} + +/****************************************************************** * if_nametoindex (IPHLPAPI.@) */ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 873612d..59e9246 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -96,6 +96,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameW)(const NET_LUID*,WCHAR*,SIZE_ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T); static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,PULONG); static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); @@ -149,6 +150,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask"); pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } @@ -2174,6 +2176,49 @@ static void test_GetUnicastIpAddressTable(void) pFreeMibTable(table); } +static void test_ConvertLengthToIpv4Mask(void) +{ + DWORD apiReturn; + ULONG Mask; + + if (!pConvertLengthToIpv4Mask) + { + win_skip( "ConvertLengthToIpv4Mask not available\n" ); + return; + } + + apiReturn = pConvertLengthToIpv4Mask(0, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x00000000\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(1, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0x80000000, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x80000000\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(31, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0xfffffffe, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x00000001\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(32, &Mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(Mask == 0xffffffff, + "ConvertLengthToIpv4Mask Mask value %x, expected 0xffffffff\n", Mask); + + apiReturn = pConvertLengthToIpv4Mask(33, &Mask); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "ConvertLengthToIpv4Mask(32, &Mask) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + ok(Mask == INADDR_NONE, + "ConvertLengthToIpv4Mask Mask value %x, expected INADDR_NONE\n", Mask); +} + START_TEST(iphlpapi) { @@ -2201,6 +2246,7 @@ START_TEST(iphlpapi) test_GetIfTable2Ex(); test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); + test_ConvertLengthToIpv4Mask(); freeIPHlpApi(); } } diff --git a/include/netioapi.h b/include/netioapi.h index 1095888..beb93d2 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -170,6 +170,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID*,char*,SIZE_T); DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID*,WCHAR*,SIZE_T); DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG MaskLength, PULONG Mask); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); -- 2.7.4

2 2

[PATCH v2] windowscodecs: Implement WICCreateBitmapFromSectionEx.
by Hans Leidekker 22 Mar '18

22 Mar '18

Based on a patch by Dmitry Timoshkov. v2: Get rid of the bits parameter and drop the offset check. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/windowscodecs/bitmap.c | 22 +++++--- dlls/windowscodecs/imgfactory.c | 95 ++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/bitmap.c | 60 +++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 2 +- dlls/windowscodecs/windowscodecs.spec | 3 +- include/wincodec.idl | 8 +++ 6 files changed, 175 insertions(+), 15 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 6adaab0aea..f8414962f2 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -45,6 +45,8 @@ typedef struct BitmapImpl { int palette_set; LONG lock; /* 0 if not locked, -1 if locked for writing, count if locked for reading */ BYTE *data; + void *view; /* used if data is a section created by an application */ + UINT offset; /* offset into view */ UINT width, height; UINT stride; UINT bpp; @@ -284,7 +286,10 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) if (This->palette) IWICPalette_Release(This->palette); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This->data); + if (This->view) + UnmapViewOfFile(This->view); + else + HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); } @@ -693,9 +698,8 @@ static const IMILUnknown2Vtbl IMILUnknown2Impl_Vtbl = IMILUnknown2Impl_UnknownMethod1, }; -HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, - UINT stride, UINT datasize, BYTE *bits, - REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, +HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, UINT stride, UINT datasize, void *view, + UINT offset, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { HRESULT hr; @@ -713,14 +717,14 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, if (stride < ((bpp*uiWidth)+7)/8) return E_INVALIDARG; This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); - if (!This || !data) + if (!This) return E_OUTOFMEMORY; + + if (view) data = (BYTE *)view + offset; + else if (!(data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize))) { HeapFree(GetProcessHeap(), 0, This); - HeapFree(GetProcessHeap(), 0, data); return E_OUTOFMEMORY; } - if (bits) memcpy(data, bits, datasize); This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; This->IMILBitmapSource_iface.lpVtbl = &IMILBitmapImpl_Vtbl; @@ -731,6 +735,8 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, This->palette_set = 0; This->lock = 0; This->data = data; + This->view = view; + This->offset = offset; This->width = uiWidth; This->height = uiHeight; This->stride = stride; diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index e1bcc89a8b..06e3f6aceb 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -473,7 +473,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmap(IWICComponentFactory *iface, { TRACE("(%p,%u,%u,%s,%u,%p)\n", iface, uiWidth, uiHeight, debugstr_guid(pixelFormat), option, ppIBitmap); - return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, pixelFormat, option, ppIBitmap); + return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, 0, pixelFormat, option, ppIBitmap); } static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFactory *iface, @@ -520,7 +520,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto } if (SUCCEEDED(hr)) - hr = BitmapImpl_Create(width, height, 0, 0, NULL, &pixelformat, option, &result); + hr = BitmapImpl_Create(width, height, 0, 0, NULL, 0, &pixelformat, option, &result); if (SUCCEEDED(hr)) { @@ -595,12 +595,36 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromMemory(IWICComponentFacto UINT width, UINT height, REFWICPixelFormatGUID format, UINT stride, UINT size, BYTE *buffer, IWICBitmap **bitmap) { + HRESULT hr; + TRACE("(%p,%u,%u,%s,%u,%u,%p,%p\n", iface, width, height, debugstr_guid(format), stride, size, buffer, bitmap); if (!stride || !size || !buffer || !bitmap) return E_INVALIDARG; - return BitmapImpl_Create(width, height, stride, size, buffer, format, WICBitmapCacheOnLoad, bitmap); + hr = BitmapImpl_Create(width, height, stride, size, NULL, 0, format, WICBitmapCacheOnLoad, bitmap); + if (SUCCEEDED(hr)) + { + IWICBitmapLock *lock; + + hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock); + if (SUCCEEDED(hr)) + { + UINT buffersize; + BYTE *data; + + IWICBitmapLock_GetDataPointer(lock, &buffersize, &data); + memcpy(data, buffer, buffersize); + + IWICBitmapLock_Release(lock); + } + else + { + IWICBitmap_Release(*bitmap); + *bitmap = NULL; + } + } + return hr; } static BOOL get_16bpp_format(HBITMAP hbm, WICPixelFormatGUID *format) @@ -710,7 +734,8 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFact return E_INVALIDARG; } - hr = BitmapImpl_Create(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, 0, NULL, &format, WICBitmapCacheOnLoad, bitmap); + hr = BitmapImpl_Create(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, 0, NULL, 0, &format, + WICBitmapCacheOnLoad, bitmap); if (hr != S_OK) return hr; hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock); @@ -794,7 +819,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactor stride = width * 4; size = stride * height; - hr = BitmapImpl_Create(width, height, stride, size, NULL, + hr = BitmapImpl_Create(width, height, stride, size, NULL, 0, &GUID_WICPixelFormat32bppBGRA, WICBitmapCacheOnLoad, bitmap); if (hr != S_OK) goto failed; @@ -1176,3 +1201,63 @@ HRESULT ComponentFactory_CreateInstance(REFIID iid, void** ppv) return ret; } + +HRESULT WINAPI WICCreateBitmapFromSectionEx(UINT width, UINT height, + REFWICPixelFormatGUID format, HANDLE section, UINT stride, + UINT offset, WICSectionAccessLevel wicaccess, IWICBitmap **bitmap) +{ + SYSTEM_INFO sysinfo; + UINT bpp, access, size, view_offset, view_size; + void *view; + HRESULT hr; + + TRACE("%u,%u,%s,%p,%u,%u,%#x,%p\n", width, height, debugstr_guid(format), + section, stride, offset, wicaccess, bitmap); + + if (!width || !height || !section || !bitmap) return E_INVALIDARG; + + hr = get_pixelformat_bpp(format, &bpp); + if (FAILED(hr)) return hr; + + switch (wicaccess) + { + case WICSectionAccessLevelReadWrite: + access = FILE_MAP_READ | FILE_MAP_WRITE; + break; + + case WICSectionAccessLevelRead: + access = FILE_MAP_READ; + break; + + default: + FIXME("unsupported access %#x\n", wicaccess); + return E_INVALIDARG; + } + + if (!stride) stride = (((bpp * width) + 31) / 32) * 4; + size = stride * height; + if (size / height != stride) return E_INVALIDARG; + + GetSystemInfo(&sysinfo); + view_offset = offset - (offset % sysinfo.dwAllocationGranularity); + view_size = size + (offset - view_offset); + + view = MapViewOfFile(section, access, 0, view_offset, view_size); + if (!view) return HRESULT_FROM_WIN32(GetLastError()); + + offset -= view_offset; + hr = BitmapImpl_Create(width, height, stride, 0, view, offset, format, WICBitmapCacheOnLoad, bitmap); + if (FAILED(hr)) UnmapViewOfFile(view); + return hr; +} + +HRESULT WINAPI WICCreateBitmapFromSection(UINT width, UINT height, + REFWICPixelFormatGUID format, HANDLE section, + UINT stride, UINT offset, IWICBitmap **bitmap) +{ + TRACE("%u,%u,%s,%p,%u,%u,%p\n", width, height, debugstr_guid(format), + section, stride, offset, bitmap); + + return WICCreateBitmapFromSectionEx(width, height, format, section, + stride, offset, WICSectionAccessLevelRead, bitmap); +} diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 42f452acaf..6e01f0b1d1 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -972,6 +972,64 @@ static void test_clipper(void) IWICBitmapClipper_Release(clipper); } +static HRESULT (WINAPI *pWICCreateBitmapFromSectionEx) + (UINT, UINT, REFWICPixelFormatGUID, HANDLE, UINT, UINT, WICSectionAccessLevel, IWICBitmap **); + +static void test_WICCreateBitmapFromSectionEx(void) +{ + SYSTEM_INFO sysinfo; + HANDLE hsection; + BITMAPINFO info; + void *bits; + HBITMAP hdib; + IWICBitmap *bitmap; + HRESULT hr; + pWICCreateBitmapFromSectionEx = + (void *)GetProcAddress(LoadLibraryA("windowscodecs"), "WICCreateBitmapFromSectionEx"); + + if (!pWICCreateBitmapFromSectionEx) + { + win_skip("WICCreateBitmapFromSectionEx not available\n"); + return; + } + + GetSystemInfo(&sysinfo); + hsection = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, + sysinfo.dwAllocationGranularity * 2, NULL); + ok(hsection != NULL, "CreateFileMapping failed %u\n", GetLastError()); + + memset(&info, 0, sizeof(info)); + info.bmiHeader.biSize = sizeof(info.bmiHeader); + info.bmiHeader.biWidth = 3; + info.bmiHeader.biHeight = -3; + info.bmiHeader.biBitCount = 24; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biCompression = BI_RGB; + + hdib = CreateDIBSection(0, &info, DIB_RGB_COLORS, &bits, hsection, 0); + ok(hdib != NULL, "CreateDIBSection failed\n"); + + hr = pWICCreateBitmapFromSectionEx(3, 3, &GUID_WICPixelFormat24bppBGR, hsection, 0, 0, + WICSectionAccessLevelReadWrite, &bitmap); + ok(hr == S_OK, "WICCreateBitmapFromSectionEx returned %#x\n", hr); + IWICBitmap_Release(bitmap); + + /* non-zero offset, smaller than allocation granularity */ + hr = pWICCreateBitmapFromSectionEx(3, 3, &GUID_WICPixelFormat24bppBGR, hsection, 0, 0x100, + WICSectionAccessLevelReadWrite, &bitmap); + ok(hr == S_OK, "WICCreateBitmapFromSectionEx returned %#x\n", hr); + IWICBitmap_Release(bitmap); + + /* offset larger than allocation granularity */ + hr = pWICCreateBitmapFromSectionEx(3, 3, &GUID_WICPixelFormat24bppBGR, hsection, 0, + sysinfo.dwAllocationGranularity + 1, + WICSectionAccessLevelReadWrite, &bitmap); + ok(hr == S_OK, "WICCreateBitmapFromSectionEx returned %#x\n", hr); + IWICBitmap_Release(bitmap); + DeleteObject(hdib); + CloseHandle(hsection); +} + START_TEST(bitmap) { HRESULT hr; @@ -992,4 +1050,6 @@ START_TEST(bitmap) IWICImagingFactory_Release(factory); CoUninitialize(); + + test_WICCreateBitmapFromSectionEx(); } diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 8bba811250..c2c5ce4e6c 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -91,7 +91,7 @@ extern HRESULT IcnsEncoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDE extern HRESULT TgaDecoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, - UINT stride, UINT datasize, BYTE *bits, + UINT stride, UINT datasize, void *view, UINT offset, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) DECLSPEC_HIDDEN; extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 49346fc86b..905ef835af 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -105,7 +105,8 @@ @ stdcall IWICStream_InitializeFromIStream_Proxy(ptr ptr) IWICStream_InitializeFromIStream_Proxy_W @ stdcall IWICStream_InitializeFromMemory_Proxy(ptr ptr long) IWICStream_InitializeFromMemory_Proxy_W @ stdcall WICConvertBitmapSource(ptr ptr ptr) -@ stub WICCreateBitmapFromSection +@ stdcall WICCreateBitmapFromSection(long long ptr long long long ptr) +@ stdcall WICCreateBitmapFromSectionEx(long long ptr long long long long ptr) @ stdcall WICCreateColorContext_Proxy(ptr ptr) @ stdcall WICCreateImagingFactory_Proxy(long ptr) @ stub WICGetMetadataContentSize diff --git a/include/wincodec.idl b/include/wincodec.idl index f2c5a9e626..50d7db7620 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -189,6 +189,12 @@ typedef enum WICPngFilterOption { WICPNFFILTEROPTION_FORCE_DWORD = CODEC_FORCE_DWORD } WICPngFilterOption; +typedef enum WICSectionAccessLevel { + WICSectionAccessLevelRead = 0x00000001, + WICSectionAccessLevelReadWrite = 0x00000003, + WICSectionAccessLevel_FORCE_DWORD = CODEC_FORCE_DWORD +} WICSectionAccessLevel; + typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID; @@ -1058,6 +1064,8 @@ interface IWICEnumMetadataItem : IUnknown } cpp_quote("HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst);") +cpp_quote("HRESULT WINAPI WICCreateBitmapFromSection(UINT width, UINT height, REFWICPixelFormatGUID format, HANDLE section, UINT stride, UINT offset, IWICBitmap **bitmap);") +cpp_quote("HRESULT WINAPI WICCreateBitmapFromSectionEx(UINT width, UINT height, REFWICPixelFormatGUID format, HANDLE section, UINT stride, UINT offset, WICSectionAccessLevel access, IWICBitmap **bitmap);") cpp_quote("HRESULT WINAPI WICMapGuidToShortName(REFGUID,UINT,WCHAR *,UINT *);") cpp_quote("HRESULT WINAPI WICMapShortNameToGuid(PCWSTR,GUID *);") -- 2.11.0

2 1

[PATCH 1/3] wined3d: Implement updating swap interval through wined3d_swapchain_present().
by Józef Kucia 22 Mar '18

22 Mar '18

Based on a patch by Michael Müller. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 4 ++++ dlls/d3d8/swapchain.c | 3 ++- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 23 +++++++++++++++++------ dlls/d3d9/swapchain.c | 3 ++- dlls/dxgi/swapchain.c | 10 +++++++--- dlls/wined3d/cs.c | 11 ++++++++++- dlls/wined3d/surface.c | 3 ++- dlls/wined3d/swapchain.c | 7 ++++--- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 4 ++-- 13 files changed, 55 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index cba5dd647b49..2510d58c454d 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -166,6 +166,7 @@ struct d3d8_swapchain LONG refcount; struct wined3d_swapchain *wined3d_swapchain; IDirect3DDevice8 *parent_device; + unsigned int swap_interval; }; HRESULT d3d8_swapchain_create(struct d3d8_device *device, struct wined3d_swapchain_desc *desc, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4fcad71451e6..6dc58cb43b2b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -913,6 +913,8 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, NULL, reset_enum_callback, TRUE))) { present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; + device->implicit_swapchain->swap_interval + = wined3dswapinterval_from_d3dpresentationinterval(present_parameters->FullScreen_PresentationInterval); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); @@ -3476,6 +3478,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0); device->implicit_swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + device->implicit_swapchain->swap_interval + = wined3dswapinterval_from_d3dpresentationinterval(parameters->FullScreen_PresentationInterval); device->d3d_parent = &parent->IDirect3D8_iface; IDirect3D8_AddRef(device->d3d_parent); diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 7003aa32dbcb..b9350084a500 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -105,7 +105,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d8_swapchain_Present(IDirect3DSwapChai wined3d_mutex_lock(); hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, - src_rect, dst_rect, dst_window_override, 0); + src_rect, dst_rect, dst_window_override, swapchain->swap_interval, 0); wined3d_mutex_unlock(); return hr; @@ -173,6 +173,7 @@ static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_devi swapchain->refcount = 1; swapchain->IDirect3DSwapChain8_iface.lpVtbl = &d3d8_swapchain_vtbl; + swapchain->swap_interval = desc->swap_interval; wined3d_mutex_lock(); hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index ba19e5fb08fe..4d783eb9a1ae 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -151,6 +151,7 @@ struct d3d9_swapchain LONG refcount; struct wined3d_swapchain *wined3d_swapchain; IDirect3DDevice9Ex *parent_device; + unsigned int swap_interval; }; HRESULT d3d9_swapchain_create(struct d3d9_device *device, struct wined3d_swapchain_desc *desc, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 457a0cdca9c9..7c84257c220a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -991,6 +991,8 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, } else { + device->implicit_swapchains[0]->swap_interval + = wined3dswapinterval_from_d3dpresentationinterval(present_parameters->PresentationInterval); wined3d_swapchain_get_desc(device->implicit_swapchains[0]->wined3d_swapchain, &swapchain_desc); present_parameters->BackBufferWidth = swapchain_desc.backbuffer_width; present_parameters->BackBufferHeight = swapchain_desc.backbuffer_height; @@ -1033,7 +1035,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex * const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - UINT i; + struct d3d9_swapchain *swapchain; + unsigned int i; HRESULT hr; TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.\n", @@ -1048,8 +1051,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex * wined3d_mutex_lock(); for (i = 0; i < device->implicit_swapchain_count; ++i) { - if (FAILED(hr = wined3d_swapchain_present(device->implicit_swapchains[i]->wined3d_swapchain, - src_rect, dst_rect, dst_window_override, 0))) + swapchain = device->implicit_swapchains[i]; + if (FAILED(hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, + src_rect, dst_rect, dst_window_override, swapchain->swap_interval, 0))) { wined3d_mutex_unlock(); return hr; @@ -3724,7 +3728,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_PresentEx(IDirect3DDevice9Ex const RGNDATA *dirty_region, DWORD flags) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - UINT i; + struct d3d9_swapchain *swapchain; + unsigned int i; HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", @@ -3740,8 +3745,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_PresentEx(IDirect3DDevice9Ex wined3d_mutex_lock(); for (i = 0; i < device->implicit_swapchain_count; ++i) { - if (FAILED(hr = wined3d_swapchain_present(device->implicit_swapchains[i]->wined3d_swapchain, - src_rect, dst_rect, dst_window_override, flags))) + swapchain = device->implicit_swapchains[i]; + if (FAILED(hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, + src_rect, dst_rect, dst_window_override, swapchain->swap_interval, flags))) { wined3d_mutex_unlock(); return hr; @@ -4328,6 +4334,11 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_mutex_unlock(); return E_OUTOFMEMORY; } + for (i = 0; i < device->implicit_swapchain_count; ++i) + { + device->implicit_swapchains[i]->swap_interval + = wined3dswapinterval_from_d3dpresentationinterval(parameters[i].PresentationInterval); + } for (i = 0; i < count; ++i) { diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 411040ad66df..6a182d4012d6 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -137,7 +137,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai wined3d_mutex_lock(); hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, - src_rect, dst_rect, dst_window_override, flags); + src_rect, dst_rect, dst_window_override, swapchain->swap_interval, flags); wined3d_mutex_unlock(); return hr; @@ -350,6 +350,7 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi swapchain->refcount = 1; swapchain->IDirect3DSwapChain9Ex_iface.lpVtbl = &d3d9_swapchain_vtbl; + swapchain->swap_interval = desc->swap_interval; wined3d_mutex_lock(); hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 1f88d71b77a7..6f9d0338aeef 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -533,6 +533,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present1(IDXGISwapChain1 *iface, TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); + if (sync_interval > 4) + { + WARN("Invalid sync interval %u.\n", sync_interval); + return DXGI_ERROR_INVALID_CALL; + } + if (flags & ~DXGI_PRESENT_TEST) FIXME("Unimplemented flags %#x.\n", flags); if (flags & DXGI_PRESENT_TEST) @@ -541,13 +547,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present1(IDXGISwapChain1 *iface, return S_OK; } - if (sync_interval) - FIXME("Unimplemented sync interval %u.\n", sync_interval); if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); wined3d_mutex_lock(); - hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, 0); + hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f7ae3be184f1..015b4c537ffb 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -94,6 +94,7 @@ struct wined3d_cs_present struct wined3d_swapchain *swapchain; RECT src_rect; RECT dst_rect; + unsigned int swap_interval; DWORD flags; }; @@ -453,6 +454,12 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) swapchain = op->swapchain; wined3d_swapchain_set_window(swapchain, op->dst_window_override); + if (swapchain->desc.swap_interval != op->swap_interval) + { + swapchain->desc.swap_interval = op->swap_interval; + swapchain_update_swap_interval(swapchain); + } + swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->flags); wined3d_resource_release(&swapchain->front_buffer->resource); @@ -465,7 +472,8 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) } void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) + const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, + unsigned int swap_interval, DWORD flags) { struct wined3d_cs_present *op; unsigned int i; @@ -477,6 +485,7 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw op->swapchain = swapchain; op->src_rect = *src_rect; op->dst_rect = *dst_rect; + op->swap_interval = swap_interval; op->flags = flags; pending = InterlockedIncrement(&cs->pending_presents); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2a725e61e1c1..ce7a4bae4bfa 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3693,7 +3693,8 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ /* Set the swap effect to COPY, we don't want the backbuffer to become * undefined. */ dst_swapchain->desc.swap_effect = WINED3D_SWAP_EFFECT_COPY; - wined3d_swapchain_present(dst_swapchain, NULL, NULL, dst_swapchain->win_handle, 0); + wined3d_swapchain_present(dst_swapchain, NULL, NULL, dst_swapchain->win_handle, + dst_swapchain->desc.swap_interval, 0); dst_swapchain->desc.swap_effect = swap_effect; return WINED3D_OK; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4903445a0f0c..6bbba4d8f53d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -146,7 +146,8 @@ void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWN } HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) + const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, + unsigned int swap_interval, DWORD flags) { RECT s, d; @@ -159,7 +160,7 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, if (!swapchain->back_buffers) { - WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL\n"); + WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; } @@ -177,7 +178,7 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, } wined3d_cs_emit_present(swapchain->device->cs, swapchain, src_rect, - dst_rect, dst_window_override, flags); + dst_rect, dst_window_override, swap_interval, flags); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d2b6bef36340..16d22f5263ac 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -281,7 +281,7 @@ @ cdecl wined3d_swapchain_get_desc(ptr ptr) @ cdecl wined3d_swapchain_get_raster_status(ptr ptr) @ cdecl wined3d_swapchain_incref(ptr) -@ cdecl wined3d_swapchain_present(ptr ptr ptr ptr long) +@ cdecl wined3d_swapchain_present(ptr ptr ptr ptr long long) @ cdecl wined3d_swapchain_resize_buffers(ptr long long long long long long) @ cdecl wined3d_swapchain_resize_target(ptr ptr) @ cdecl wined3d_swapchain_set_fullscreen(ptr ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fdbcd7c37957..6f54df164374 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3548,8 +3548,8 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; -void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, + const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend_state *state) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a4b939c4e2cd..28afb013f422 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2654,8 +2654,8 @@ void __cdecl wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchai HRESULT __cdecl wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, struct wined3d_raster_status *raster_status); ULONG __cdecl wined3d_swapchain_incref(struct wined3d_swapchain *swapchain); -HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags); +HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, + const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags); HRESULT __cdecl wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality); -- 2.16.1

2 5

[PATCH 5/5] usp10: Use usp10_array_reserve() in usp10_language_add_feature_list().
by Henri Verbeet 22 Mar '18

22 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/opentype.c | 9 ++------- dlls/usp10/usp10_internal.h | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 88272656038..b627aa2a9cd 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2818,15 +2818,10 @@ static void usp10_language_add_feature_list(LoadedLanguage *language, char table TRACE("table_type %#x, %u features.\n", table_type, count); - if (!count) + if (!count || !usp10_array_reserve((void **)&language->features, &language->features_size, + language->feature_count + count, sizeof(*language->features))) return; - if (!language->feature_count) - language->features = heap_alloc(count * sizeof(*language->features)); - else - language->features = HeapReAlloc(GetProcessHeap(), 0, language->features, - (language->feature_count + count) * sizeof(*language->features)); - for (i = 0; i < count; ++i) { const OT_FeatureRecord *record; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 99d7cd11b11..369a66dd58b 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -163,8 +163,9 @@ typedef struct { OPENTYPE_TAG tag; const void *table[USP10_LANGUAGE_TABLE_COUNT]; BOOL features_initialized; - INT feature_count; LoadedFeature *features; + SIZE_T features_size; + SIZE_T feature_count; } LoadedLanguage; enum usp10_script_table -- 2.11.0

2 1

[PATCH 6/6] bcrypt: Fix BCryptEncrypt with AES_GCM and no input and no output.
by Hans Leidekker 22 Mar '18

22 Mar '18

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b21dc1fd18..e05e94ce73 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1440,7 +1440,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp *ret_len = input_len; if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; - if (!output) return STATUS_SUCCESS; + if (input && !output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 0bd91afce9..d38e581b85 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -647,6 +647,9 @@ static void test_BCryptEncrypt(void) {0x9a,0x92,0x32,0x2c,0x61,0x2a,0xae,0xef,0x66,0x2a,0xfb,0x55,0xe9,0x48,0xdf,0xbd}; static UCHAR expected_tag3[] = {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; + static UCHAR expected_tag4[] = + {0x4c,0x42,0x83,0x9e,0x8d,0x40,0xf1,0x19,0xd6,0x2b,0x1c,0x66,0x03,0x2b,0x39,0x63}; + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; UCHAR *buf, ciphertext[48], ivbuf[16], tag[16]; BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length; @@ -842,6 +845,21 @@ static void test_BCryptEncrypt(void) for (i = 0; i < 16; i++) ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 0, &auth_info, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!size, "got %u\n", size); + for (i = 0; i < 16; i++) + ok(tag[i] == 0xff, "%u: %02x != %02x\n", i, tag[i], 0xff); + + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, NULL, 0, &auth_info, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!size, "got %u\n", size); + ok(!memcmp(tag, expected_tag4, sizeof(expected_tag4)), "wrong tag\n"); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag4[i], "%u: %02x != %02x\n", i, tag[i], expected_tag4[i]); + /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); -- 2.11.0

1 0

[PATCH 5/6] bcrypt/tests: Add more tests for BCryptGenerateSymmetricKey and BCryptDuplicateKey.
by Hans Leidekker 22 Mar '18

22 Mar '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d33c096a75..0bd91afce9 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -516,6 +516,11 @@ static void test_BCryptGenerateSymmetricKey(void) ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + key = (void *)0xdeadbeef; + ret = pBCryptGenerateSymmetricKey(NULL, &key, NULL, 0, secret, sizeof(secret), 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ok(key == (void *)0xdeadbeef, "got %p\n", key); + key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); @@ -551,8 +556,10 @@ static void test_BCryptGenerateSymmetricKey(void) for (i = 0; i < 16; i++) ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + key2 = (void *)0xdeadbeef; ret = pBCryptDuplicateKey(NULL, &key2, NULL, 0, 0); ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ok(key2 == (void *)0xdeadbeef, "got %p\n", key2); if (0) /* crashes on some Windows versions */ { @@ -660,9 +667,11 @@ static void test_BCryptEncrypt(void) ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); /* input size is a multiple of block size */ size = 0; @@ -771,9 +780,11 @@ static void test_BCryptEncrypt(void) ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); @@ -913,9 +924,11 @@ static void test_BCryptDecrypt(void) ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); /* input size is a multiple of block size */ size = 0; @@ -1012,9 +1025,11 @@ static void test_BCryptDecrypt(void) ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); -- 2.11.0

1 0

[PATCH 4/6] bcrypt/tests: Add tests for auth data in AES GCM mode.
by Hans Leidekker 22 Mar '18

22 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index f67a975362..d33c096a75 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -610,7 +610,9 @@ static void test_BCryptGenerateSymmetricKey(void) static void test_BCryptEncrypt(void) { static UCHAR nonce[] = - {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60}; + {0x10,0x20,0x30,0x40,0x50,0x60,0x10,0x20,0x30,0x40,0x50,0x60}; + static UCHAR auth_data[] = + {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; static UCHAR secret[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; static UCHAR iv[] = @@ -636,6 +638,8 @@ static void test_BCryptEncrypt(void) {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR expected_tag2[] = {0x9a,0x92,0x32,0x2c,0x61,0x2a,0xae,0xef,0x66,0x2a,0xfb,0x55,0xe9,0x48,0xdf,0xbd}; + static UCHAR expected_tag3[] = + {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; UCHAR *buf, ciphertext[48], ivbuf[16], tag[16]; BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length; @@ -809,6 +813,24 @@ static void test_BCryptEncrypt(void) for (i = 0; i < 16; i++) ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); + /* test with auth data */ + auth_info.pbAuthData = auth_data; + auth_info.cbAuthData = sizeof(auth_data); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0xff, sizeof(ciphertext)); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(tag, expected_tag3, sizeof(expected_tag3)), "wrong tag\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); @@ -831,7 +853,9 @@ static void test_BCryptEncrypt(void) static void test_BCryptDecrypt(void) { static UCHAR nonce[] = - {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60}; + {0x10,0x20,0x30,0x40,0x50,0x60,0x10,0x20,0x30,0x40,0x50,0x60}; + static UCHAR auth_data[] = + {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; static UCHAR secret[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; static UCHAR iv[] = @@ -858,6 +882,8 @@ static void test_BCryptDecrypt(void) 0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94}; static UCHAR tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; + static UCHAR tag2[] = + {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; BCRYPT_KEY_LENGTHS_STRUCT key_lengths; BCRYPT_ALG_HANDLE aes; @@ -1007,6 +1033,20 @@ static void test_BCryptDecrypt(void) ok(size == 32, "got %u\n", size); ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + /* test with auth data */ + auth_info.pbAuthData = auth_data; + auth_info.cbAuthData = sizeof(auth_data); + auth_info.pbTag = tag2; + auth_info.cbTag = sizeof(tag2); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + /* test with wrong tag */ memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ -- 2.11.0

1 0

[PATCH 3/6] bcrypt: Add support for auth data in AES GCM mode.
by Hans Leidekker 22 Mar '18

22 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 47b6cafdea..b21dc1fd18 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -52,6 +52,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Not present in gnutls version < 3.0 */ static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size); +static int (*pgnutls_cipher_add_auth)(gnutls_cipher_hd_t handle, const void *ptext, size_t ptext_size); static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -72,7 +73,12 @@ MAKE_FUNCPTR(gnutls_perror); #define GNUTLS_CIPHER_AES_256_GCM 94 #endif -static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void * tag, size_t tag_size) +static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void *tag, size_t tag_size) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + +static int compat_gnutls_cipher_add_auth(gnutls_cipher_hd_t handle, const void *ptext, size_t ptext_size) { return GNUTLS_E_UNKNOWN_CIPHER_TYPE; } @@ -115,6 +121,11 @@ static BOOL gnutls_initialize(void) WARN("gnutls_cipher_tag not found\n"); pgnutls_cipher_tag = compat_gnutls_cipher_tag; } + if (!(pgnutls_cipher_add_auth = wine_dlsym( libgnutls_handle, "gnutls_cipher_add_auth", NULL, 0 ))) + { + WARN("gnutls_cipher_add_auth not found\n"); + pgnutls_cipher_add_auth = compat_gnutls_cipher_add_auth; + } if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) { @@ -1022,6 +1033,19 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) return STATUS_SUCCESS; } +static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +{ + int ret; + + if ((ret = pgnutls_cipher_add_auth( key->handle, auth_data, len ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { @@ -1146,6 +1170,12 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) return STATUS_SUCCESS; } +static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { @@ -1213,6 +1243,12 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { @@ -1407,6 +1443,8 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) + return status; if ((status = key_encrypt( key, input, input_len, output, output_len ))) return status; @@ -1484,6 +1522,8 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) + return status; if ((status = key_decrypt( key, input, input_len, output, output_len ))) return status; -- 2.11.0

1 0

[PATCH 2/6] bcrypt/tests: Add tests for BCryptDuplicateKey.
by Hans Leidekker 22 Mar '18

22 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 9922e4114f..f67a975362 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -45,6 +45,7 @@ static NTSTATUS (WINAPI *pBCryptEncrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID ULONG *, ULONG); static NTSTATUS (WINAPI *pBCryptDecrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptDuplicateKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); static NTSTATUS (WINAPI *pBCryptImportKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); @@ -503,7 +504,7 @@ static void test_BCryptGenerateSymmetricKey(void) static UCHAR expected[] = {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79}; BCRYPT_ALG_HANDLE aes; - BCRYPT_KEY_HANDLE key; + BCRYPT_KEY_HANDLE key, key2; UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16]; ULONG size, len, i; NTSTATUS ret; @@ -550,6 +551,35 @@ static void test_BCryptGenerateSymmetricKey(void) for (i = 0; i < 16; i++) ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + ret = pBCryptDuplicateKey(NULL, &key2, NULL, 0, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + if (0) /* crashes on some Windows versions */ + { + ret = pBCryptDuplicateKey(key, NULL, NULL, 0, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + } + + key2 = (void *)0xdeadbeef; + ret = pBCryptDuplicateKey(key, &key2, NULL, 0, 0); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER), "got %08x\n", ret); + + if (ret == STATUS_SUCCESS) + { + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key2, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(ciphertext, expected, sizeof(expected)), "wrong data\n"); + for (i = 0; i < 16; i++) + ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + + ret = pBCryptDestroyKey(key2); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + } + size = 0xdeadbeef; ret = pBCryptDecrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -1063,6 +1093,7 @@ START_TEST(bcrypt) pBCryptGenerateSymmetricKey = (void *)GetProcAddress(module, "BCryptGenerateSymmetricKey"); pBCryptEncrypt = (void *)GetProcAddress(module, "BCryptEncrypt"); pBCryptDecrypt = (void *)GetProcAddress(module, "BCryptDecrypt"); + pBCryptDuplicateKey = (void *)GetProcAddress(module, "BCryptDuplicateKey"); pBCryptDestroyKey = (void *)GetProcAddress(module, "BCryptDestroyKey"); pBCryptImportKey = (void *)GetProcAddress(module, "BCryptImportKey"); pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey"); -- 2.11.0

1 0

[PATCH 1/6] bcrypt: Implement BCryptDuplicateKey. --- Changes from original:
by Hans Leidekker 22 Mar '18

22 Mar '18

From: Michael Müller <michael(a)fds-team.de> Merged key_duplicate implementations. Added FIXME for non-NULL object parameter. Replaced HeapAlloc with heap_alloc, etc. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 2 +- 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 21b54b4934..28c2394ce4 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -12,7 +12,7 @@ @ stdcall BCryptDestroyKey(ptr) @ stub BCryptDestroySecret @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) -@ stub BCryptDuplicateKey +@ stdcall BCryptDuplicateKey(ptr ptr ptr long long) @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) @ stdcall BCryptEnumAlgorithms(long ptr ptr long) @ stub BCryptEnumContextFunctionProviders diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index cd44bdf59c..47b6cafdea 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -876,6 +876,7 @@ static ULONG get_block_size( struct algorithm *alg ) get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); return ret; } + static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size ) { if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) @@ -896,6 +897,24 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_IMPLEMENTED; } + +static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) +{ + UCHAR *buffer; + + if (!(buffer = heap_alloc( key_orig->secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->secret, key_orig->secret_len ); + + memset( key_copy, 0, sizeof(*key_copy) ); + key_copy->hdr = key_orig->hdr; + key_copy->alg_id = key_orig->alg_id; + key_copy->mode = key_orig->mode; + key_copy->block_size = key_orig->block_size; + key_copy->secret = buffer; + key_copy->secret_len = key_orig->secret_len; + + return STATUS_SUCCESS; +} #endif #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) @@ -1182,6 +1201,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { ERR( "support for keys not available at build time\n" ); @@ -1310,6 +1335,30 @@ NTSTATUS WINAPI BCryptExportKey(BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE return key_export( key, type, output, output_len, size ); } +NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE *handle_copy, + UCHAR *object, ULONG object_len, ULONG flags ) +{ + struct key *key_orig = handle; + struct key *key_copy; + NTSTATUS status; + + TRACE( "%p, %p, %p, %u, %08x\n", handle, handle_copy, object, object_len, flags ); + if (object) FIXME( "ignoring object buffer\n" ); + + if (!key_orig || key_orig->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!handle_copy) return STATUS_INVALID_PARAMETER; + if (!(key_copy = heap_alloc( sizeof(*key_copy) ))) return STATUS_NO_MEMORY; + + if ((status = key_duplicate( key_orig, key_copy ))) + { + heap_free( key_copy ); + return status; + } + + *handle_copy = key_copy; + return STATUS_SUCCESS; +} + NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) { struct key *key = handle; diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 5d5fae0b5c..d0f0f56cc4 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -14,7 +14,7 @@ @ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey @ stub BCryptDestroySecret @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash -@ stub BCryptDuplicateKey +@ stdcall BCryptDuplicateKey(ptr ptr ptr long long) bcrypt.BCryptDuplicateKey @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt @ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms @ stub BCryptEnumContextFunctionProviders -- 2.11.0

1 0

[PATCH 4/5] wined3d: Use gl_info from the wined3d_shader_context in shader_hw_sample().
by Henri Verbeet 22 Mar '18

22 Mar '18

For simplicity. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4b4cd4e0baa..23f69a2b586 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1416,9 +1416,6 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; const char *mod; BOOL pshader = shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type); - const struct wined3d_shader *shader; - const struct wined3d_device *device; - const struct wined3d_gl_info *gl_info; const char *tex_dst = dst_str; struct color_fixup_masks masks; @@ -1432,12 +1429,8 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD break; case WINED3D_SHADER_RESOURCE_TEXTURE_2D: - shader = ins->ctx->shader; - device = shader->device; - gl_info = &device->adapter->gl_info; - if (pshader && priv->cur_ps_args->super.np2_fixup & (1u << sampler_idx) - && gl_info->supported[ARB_TEXTURE_RECTANGLE]) + && ins->ctx->gl_info->supported[ARB_TEXTURE_RECTANGLE]) tex_type = "RECT"; else tex_type = "2D"; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Simplify device_resource_released() a little.
by Henri Verbeet 22 Mar '18

22 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 56 +++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d4e39db26bd..d2728d8dd3a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5073,55 +5073,49 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) { - struct wined3d_texture *texture = texture_from_resource(resource); - - if (device->state.textures[i] == texture) + if (&device->state.textures[i]->resource == resource) { - ERR("Texture %p is still in use, stage %u.\n", texture, i); + ERR("Texture resource %p is still in use, stage %u.\n", resource, i); device->state.textures[i] = NULL; } - if (device->recording && device->update_state->textures[i] == texture) + if (device->recording && &device->update_state->textures[i]->resource == resource) { - ERR("Texture %p is still in use by recording stateblock %p, stage %u.\n", - texture, device->recording, i); + ERR("Texture resource %p is still in use by recording stateblock %p, stage %u.\n", + resource, device->recording, i); device->update_state->textures[i] = NULL; } } break; case WINED3D_RTYPE_BUFFER: + for (i = 0; i < MAX_STREAMS; ++i) { - struct wined3d_buffer *buffer = buffer_from_resource(resource); - - for (i = 0; i < MAX_STREAMS; ++i) + if (&device->state.streams[i].buffer->resource == resource) { - if (device->state.streams[i].buffer == buffer) - { - ERR("Buffer %p is still in use, stream %u.\n", buffer, i); - device->state.streams[i].buffer = NULL; - } - - if (device->recording && device->update_state->streams[i].buffer == buffer) - { - ERR("Buffer %p is still in use by stateblock %p, stream %u.\n", - buffer, device->recording, i); - device->update_state->streams[i].buffer = NULL; - } + ERR("Buffer resource %p is still in use, stream %u.\n", resource, i); + device->state.streams[i].buffer = NULL; } - if (device->state.index_buffer == buffer) + if (device->recording && &device->update_state->streams[i].buffer->resource == resource) { - ERR("Buffer %p is still in use as index buffer.\n", buffer); - device->state.index_buffer = NULL; + ERR("Buffer resource %p is still in use by stateblock %p, stream %u.\n", + resource, device->recording, i); + device->update_state->streams[i].buffer = NULL; } + } - if (device->recording && device->update_state->index_buffer == buffer) - { - ERR("Buffer %p is still in use by stateblock %p as index buffer.\n", - buffer, device->recording); - device->update_state->index_buffer = NULL; - } + if (&device->state.index_buffer->resource == resource) + { + ERR("Buffer resource %p is still in use as index buffer.\n", resource); + device->state.index_buffer = NULL; + } + + if (device->recording && &device->update_state->index_buffer->resource == resource) + { + ERR("Buffer resource %p is still in use by stateblock %p as index buffer.\n", + resource, device->recording); + device->update_state->index_buffer = NULL; } break; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Simplify context_resource_released().
by Henri Verbeet 22 Mar '18

22 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 30 +++++++++--------------------- dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index db32f1dc978..04756be09d0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1055,34 +1055,22 @@ static void context_queue_fbo_entry_destruction(struct wined3d_context *context, list_add_head(&context->fbo_destroy_list, &entry->entry); } -void context_resource_released(const struct wined3d_device *device, - struct wined3d_resource *resource, enum wined3d_resource_type type) +void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) { - struct wined3d_texture *texture; - UINT i; + unsigned int i; if (!device->d3d_initialized) return; - switch (type) + for (i = 0; i < device->context_count; ++i) { - case WINED3D_RTYPE_TEXTURE_2D: - case WINED3D_RTYPE_TEXTURE_3D: - texture = texture_from_resource(resource); - - for (i = 0; i < device->context_count; ++i) - { - struct wined3d_context *context = device->contexts[i]; - if (context->current_rt.texture == texture) - { - context->current_rt.texture = NULL; - context->current_rt.sub_resource_idx = 0; - } - } - break; + struct wined3d_context *context = device->contexts[i]; - default: - break; + if (&context->current_rt.texture->resource == resource) + { + context->current_rt.texture = NULL; + context->current_rt.sub_resource_idx = 0; + } } } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8968c164ed5..a95d6f50b68 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -222,7 +222,7 @@ static void wined3d_resource_destroy_object(void *object) struct wined3d_resource *resource = object; wined3d_resource_free_sysmem(resource); - context_resource_released(resource->device, resource, resource->type); + context_resource_released(resource->device, resource); wined3d_resource_release(resource); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5e8734e7a97..506f7dbf308 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2171,8 +2171,7 @@ void *context_map_bo_address(struct wined3d_context *context, const struct wined struct wined3d_context *context_reacquire(const struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; -void context_resource_released(const struct wined3d_device *device, - struct wined3d_resource *resource, enum wined3d_resource_type type) DECLSPEC_HIDDEN; +void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Get rid of the "StrictDrawOrdering" setting.
by Henri Verbeet 22 Mar '18

22 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 5 ++--- dlls/wined3d/buffer.c | 2 -- dlls/wined3d/context.c | 6 ------ dlls/wined3d/device.c | 5 ++--- dlls/wined3d/surface.c | 14 +++----------- dlls/wined3d/texture.c | 3 --- dlls/wined3d/wined3d_main.c | 8 -------- dlls/wined3d/wined3d_private.h | 1 - 8 files changed, 7 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e9c9d7d1bfb..4b4cd4e0baa 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7886,9 +7886,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info); - if (wined3d_settings.strict_draw_ordering - || (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture))) - context->gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + if (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture)) + context->gl_info->gl_ops.gl.p_glFlush(); return dst_location; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1055326ede1..5b924704dff 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1183,8 +1183,6 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) } GL_EXTCALL(glUnmapBuffer(buffer->buffer_type_hint)); - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); buffer_clear_dirty_areas(buffer); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 34102c76784..db32f1dc978 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4322,9 +4322,6 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); checkGLcall("glMemoryBarrier"); - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - context_release(context); } @@ -4985,8 +4982,5 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s for (i = 0; i < context->buffer_fence_count; ++i) wined3d_fence_issue(context->buffer_fences[i], device); - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - context_release(context); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c5517f5fcde..d4e39db26bd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -457,9 +457,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } } - if (wined3d_settings.strict_draw_ordering || (flags & WINED3DCLEAR_TARGET - && target->swapchain && target->swapchain->front_buffer == target)) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + if (flags & WINED3DCLEAR_TARGET && target->swapchain && target->swapchain->front_buffer == target) + gl_info->gl_ops.gl.p_glFlush(); context_release(context); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2a725e61e1c..ea6a9848535 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -337,9 +337,6 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, gl_mask, GL_NEAREST); checkGLcall("glBlitFramebuffer()"); - - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ } static BOOL is_multisample_location(const struct wined3d_texture *texture, DWORD location) @@ -489,8 +486,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, GL_COLOR_BUFFER_BIT, gl_filter); checkGLcall("glBlitFramebuffer()"); - if (wined3d_settings.strict_draw_ordering || (dst_location == WINED3D_LOCATION_DRAWABLE - && dst_texture->swapchain->front_buffer == dst_texture)) + if (dst_location == WINED3D_LOCATION_DRAWABLE && dst_texture->swapchain->front_buffer == dst_texture) gl_info->gl_ops.gl.p_glFlush(); if (restore_texture) @@ -1741,9 +1737,6 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, un checkGLcall("glDeleteTextures(1, &backup)"); } - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - context_release(context); /* The texture is now most up to date - If the surface is a render target @@ -2662,9 +2655,8 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); } - if (wined3d_settings.strict_draw_ordering - || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + if (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture) + gl_info->gl_ops.gl.p_glFlush(); /* Restore the color key parameters */ wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 187e2a246b6..9e6b599c8e9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1931,9 +1931,6 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s } heap_free(converted_mem); - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); - if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) { struct wined3d_device *device = texture->resource.device; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index b57bcdcc873..56fae6b3f96 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -83,7 +83,6 @@ struct wined3d_settings wined3d_settings = NULL, /* No wine logo by default */ TRUE, /* Prefer multisample textures to multisample renderbuffers. */ ~0u, /* Don't force a specific sample count by default. */ - FALSE, /* No strict draw ordering. */ FALSE, /* Don't range check relative addressing indices in float constants. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No HS shader model limit by default. */ @@ -290,13 +289,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", wined3d_settings.sample_count); - if (!get_config_key(hkey, appkey, "StrictDrawOrdering", buffer, size) - && !strcmp(buffer,"enabled")) - { - ERR_(winediag)("\"StrictDrawOrdering\" is deprecated, please use \"csmt\" instead.\n"); - TRACE("Enforcing strict draw ordering.\n"); - wined3d_settings.strict_draw_ordering = TRUE; - } if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) && !strcmp(buffer, "enabled")) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fdbcd7c3795..5e8734e7a97 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -395,7 +395,6 @@ struct wined3d_settings char *logo; unsigned int multisample_textures; unsigned int sample_count; - BOOL strict_draw_ordering; BOOL check_float_constants; unsigned int max_sm_vs; unsigned int max_sm_hs; -- 2.11.0

1 0

[PATCH] winex11: Fix build without Vulkan support
by Nikolay Sivov 22 Mar '18

22 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Maybe it should've been using winediag channel, or WINE_MESSAGE? dlls/winex11.drv/vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 27ff72212d..f96ef64137 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -37,10 +37,10 @@ #include "wine/vulkan.h" #include "wine/vulkan_driver.h" -#ifdef SONAME_LIBVULKAN - WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +#ifdef SONAME_LIBVULKAN + typedef VkFlags VkXlibSurfaceCreateFlagsKHR; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 -- 2.16.2

2 1

[PATCH] winevulkan: Remove excess quotation marks.
by Józef Kucia 22 Mar '18

22 Mar '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- debugstr_a() wraps strings in quotation marks --- dlls/winevulkan/vulkan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 9440000614e6..a5b8a96e9115 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -897,7 +897,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * func = wine_vk_get_instance_proc_addr(name); if (func) { - WARN("Returning instance function '%s'.\n", debugstr_a(name)); + WARN("Returning instance function %s.\n", debugstr_a(name)); return func; } @@ -932,7 +932,7 @@ static PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, } if (!instance) { - FIXME("Global function '%s' not found\n", debugstr_a(name)); + FIXME("Global function %s not found.\n", debugstr_a(name)); return NULL; } @@ -943,7 +943,7 @@ static PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, func = wine_vk_get_device_proc_addr(name); if (func) return func; - FIXME("Unsupported device or instance function: '%s'\n", debugstr_a(name)); + FIXME("Unsupported device or instance function: %s.\n", debugstr_a(name)); return NULL; } -- 2.16.1

1 0

Requesting help with NDR
by Zebediah Figura 22 Mar '18

22 Mar '18

In the course of trying to marshall MSI for bug #18070 I ran into a crash trying to marshall an interface pointer, caused by a double free. I traced the superfluous frees back to dlls/rpcrt4/ndr_ole.c: /*********************************************************************** * NdrInterfacePointerFree [RPCRT4.@] */ void WINAPI NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { LPUNKNOWN pUnk = (LPUNKNOWN)pMemory; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); if (pUnk) IUnknown_Release(pUnk); } Could anyone shed light on what the purpose of this call is? It doesn't seem to correspond with any AddRef() or QueryInterface() call anywhere else. Presumably it would correspond with NdrInterfacePointerMarshall(), which calls CoMarshalInterface(), but the latter only causes references to be grabbed by the stub manager, and those (as far as I can tell by skimming) are released when SendReceive() is called.

1 0

[PATCH 4/4] fltmgr.sys: Add FltUnregisterFilter stub
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 0a3b1c6..c217ad3 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -158,6 +158,6 @@ @ stub FltUninitializeFileLock @ stub FltUninitializeOplock @ stub FltUnloadFilter -@ stub FltUnregisterFilter +@ stdcall FltUnregisterFilter(ptr) @ stub FltUntagFile @ stub FltWriteFile diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 08beb02..cedcdb1 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -59,3 +59,8 @@ NTSTATUS WINAPI FltStartFiltering (PFLT_FILTER filter) return STATUS_SUCCESS; } + +void WINAPI FltUnregisterFilter (PFLT_FILTER filter) +{ + FIXME( "(%p): stub\n", filter ); +} -- 1.9.1

1 0

[PATCH 3/4] fltmgr.sys: Add FltStartFiltering stub
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 000368f..0a3b1c6 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -150,7 +150,7 @@ @ stub FltSetStreamHandleContext @ stub FltSetVolumeContext @ stub FltSetVolumeInformation -@ stub FltStartFiltering +@ stdcall FltStartFiltering(ptr) @ stub FltSupportsFileContexts @ stub FltSupportsStreamContexts @ stub FltSupportsStreamHandleContexts diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index efe9b7f..08beb02 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -52,3 +52,10 @@ NTSTATUS WINAPI FltRegisterFilter (PDRIVER_OBJECT driver, const FLT_REGISTRATION return STATUS_SUCCESS; } + +NTSTATUS WINAPI FltStartFiltering (PFLT_FILTER filter) +{ + FIXME( "(%p): stub\n", filter ); + + return STATUS_SUCCESS; +} -- 1.9.1

1 0

[PATCH 2/4] fltmgr.sys: Add FltRegisterFilter stub
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index ea84d81..000368f 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -128,7 +128,7 @@ @ stub FltReadFile @ stub FltReferenceContext @ stub FltReferenceFileNameInformation -@ stub FltRegisterFilter +@ stdcall FltRegisterFilter(ptr ptr ptr) @ stub FltReissueSynchronousIo @ stub FltReleaseContext @ stub FltReleaseContexts diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 09c89a1..efe9b7f 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -42,3 +42,13 @@ void WINAPI FltInitializePushLock( EX_PUSH_LOCK *lock ) { FIXME( "(%p): stub\n", lock ); } + +NTSTATUS WINAPI FltRegisterFilter (PDRIVER_OBJECT driver, const FLT_REGISTRATION *reg, PFLT_FILTER *filter) +{ + FIXME( "(%p,%p,%p): stub\n", driver, reg, filter ); + + if(filter) + *filter = UlongToHandle(0xdeadbeaf); + + return STATUS_SUCCESS; +} -- 1.9.1

1 0

[PATCH 1/4] include/ddk: Add fltkernel.h
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

This also updates fltmgr.sys to make use of this new file. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/fltmgr.sys/main.c | 5 +- include/Makefile.in | 1 + include/ddk/fltkernel.h | 667 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 670 insertions(+), 3 deletions(-) create mode 100644 include/ddk/fltkernel.h diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 70ee307..09c89a1 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -25,9 +25,8 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" -#include "ddk/ntddk.h" -#include "ddk/ntifs.h" -#include "ddk/wdm.h" +#include "ddk/fltkernel.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(fltmgr); diff --git a/include/Makefile.in b/include/Makefile.in index 72304d6..d5a3eeb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -153,6 +153,7 @@ SOURCES = \ ddk/compstui.h \ ddk/csq.h \ ddk/d3dkmthk.h \ + ddk/fltkernel.h \ ddk/hidclass.h \ ddk/hidpi.h \ ddk/hidport.h \ diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h new file mode 100644 index 0000000..fb0c4c3 --- /dev/null +++ b/include/ddk/fltkernel.h @@ -0,0 +1,667 @@ +/* + * Copyright (C) 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __FLTKERNEL__ +#define __FLTKERNEL__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include "ntifs.h" + +typedef struct _FLT_FILTER *PFLT_FILTER; +typedef struct _FLT_INSTANCE *PFLT_INSTANCE; +typedef ULONG FLT_CALLBACK_DATA_FLAGS; +typedef USHORT FLT_CONTEXT_REGISTRATION_FLAGS; +typedef USHORT FLT_CONTEXT_TYPE; +typedef ULONG FLT_FILE_NAME_OPTIONS; +typedef ULONG FLT_FILTER_UNLOAD_FLAGS; +typedef ULONG FLT_INSTANCE_QUERY_TEARDOWN_FLAGS; +typedef ULONG FLT_INSTANCE_SETUP_FLAGS; +typedef ULONG FLT_INSTANCE_TEARDOWN_FLAGS; +typedef ULONG FLT_NORMALIZE_NAME_FLAGS; +typedef ULONG FLT_OPERATION_REGISTRATION_FLAGS; +typedef ULONG FLT_POST_OPERATION_FLAGS; +typedef ULONG FLT_REGISTRATION_FLAGS; +typedef void* PFLT_CONTEXT; + + +#define FLT_VOLUME_CONTEXT 0x0001 +#define FLT_INSTANCE_CONTEXT 0x0002 +#define FLT_FILE_CONTEXT 0x0004 +#define FLT_STREAM_CONTEXT 0x0008 +#define FLT_STREAMHANDLE_CONTEXT 0x0010 +#define FLT_TRANSACTION_CONTEXT 0x0020 + +#define FLTFL_OPERATION_REGISTRATION_SKIP_PAGING_IO 0x00000001 +#define FLTFL_OPERATION_REGISTRATION_SKIP_CACHED_IO 0x00000002 +#define FLTFL_OPERATION_REGISTRATION_SKIP_NON_DASD_IO 0x00000004 + +#define FLTFL_INSTANCE_TEARDOWN_MANUAL 0x00000001 +#define FLTFL_INSTANCE_TEARDOWN_FILTER_UNLOAD 0x00000002 +#define FLTFL_INSTANCE_TEARDOWN_MANDATORY_FILTER_UNLOAD 0x00000004 +#define FLTFL_INSTANCE_TEARDOWN_VOLUME_DISMOUNT 0x00000008 +#define FLTFL_INSTANCE_TEARDOWN_INTERNAL_ERROR 0x00000010 + +/* Belongs in fltuserstructures.h */ +typedef enum _FLT_FILESYSTEM_TYPE +{ + FLT_FSTYPE_UNKNOWN, + FLT_FSTYPE_RAW, + FLT_FSTYPE_NTFS, + FLT_FSTYPE_FAT, + FLT_FSTYPE_CDFS, + FLT_FSTYPE_UDFS, + FLT_FSTYPE_LANMAN, + FLT_FSTYPE_WEBDAV, + FLT_FSTYPE_RDPDR, + FLT_FSTYPE_NFS, + FLT_FSTYPE_MS_NETWARE, + FLT_FSTYPE_NETWARE, + FLT_FSTYPE_BSUDF, + FLT_FSTYPE_MUP, + FLT_FSTYPE_RSFX, + FLT_FSTYPE_ROXIO_UDF1, + FLT_FSTYPE_ROXIO_UDF2, + FLT_FSTYPE_ROXIO_UDF3, + FLT_FSTYPE_TACIT, + FLT_FSTYPE_FS_REC, + FLT_FSTYPE_INCD, + FLT_FSTYPE_INCD_FAT, + FLT_FSTYPE_EXFAT, + FLT_FSTYPE_PSFS, + FLT_FSTYPE_GPFS, + FLT_FSTYPE_NPFS, + FLT_FSTYPE_MSFS, + FLT_FSTYPE_CSVFS, + FLT_FSTYPE_REFS, + FLT_FSTYPE_OPENAFS +} FLT_FILESYSTEM_TYPE, *PFLT_FILESYSTEM_TYPE; + +typedef struct _FLT_NAME_CONTROL +{ + UNICODE_STRING Name; +} FLT_NAME_CONTROL, *PFLT_NAME_CONTROL; + +typedef enum _FLT_PREOP_CALLBACK_STATUS +{ + FLT_PREOP_SUCCESS_WITH_CALLBACK, + FLT_PREOP_SUCCESS_NO_CALLBACK, + FLT_PREOP_PENDING, + FLT_PREOP_DISALLOW_FASTIO, + FLT_PREOP_COMPLETE, + FLT_PREOP_SYNCHRONIZE, + FLT_PREOP_DISALLOW_FSFILTER_IO +} FLT_PREOP_CALLBACK_STATUS, *PFLT_PREOP_CALLBACK_STATUS; + +typedef enum _FLT_POSTOP_CALLBACK_STATUS +{ + FLT_POSTOP_FINISHED_PROCESSING, + FLT_POSTOP_MORE_PROCESSING_REQUIRED, + FLT_POSTOP_DISALLOW_FSFILTER_IO +} FLT_POSTOP_CALLBACK_STATUS, *PFLT_POSTOP_CALLBACK_STATUS; + +typedef struct _FLT_RELATED_CONTEXTS +{ + PFLT_CONTEXT VolumeContext; + PFLT_CONTEXT InstanceContext; + PFLT_CONTEXT FileContext; + PFLT_CONTEXT StreamContext; + PFLT_CONTEXT StreamHandleContext; + PFLT_CONTEXT TransactionContext; +} FLT_RELATED_CONTEXTS, *PFLT_RELATED_CONTEXTS; + +typedef const struct _FLT_RELATED_OBJECTS *PCFLT_RELATED_OBJECTS; + +typedef union _FLT_PARAMETERS +{ + struct + { + PIO_SECURITY_CONTEXT SecurityContext; + ULONG Options; + USHORT POINTER_ALIGNMENT FileAttributes; + USHORT ShareAccess; + ULONG POINTER_ALIGNMENT EaLength; + void *EaBuffer; + LARGE_INTEGER AllocationSize; + } Create; + + struct + { + PIO_SECURITY_CONTEXT SecurityContext; + ULONG Options; + USHORT POINTER_ALIGNMENT Reserved; + USHORT ShareAccess; + void *Parameters; + } CreatePipe; + +#undef CreateMailslot + struct + { + PIO_SECURITY_CONTEXT SecurityContext; + ULONG Options; + USHORT POINTER_ALIGNMENT Reserved; + USHORT ShareAccess; + void *Parameters; + } CreateMailslot; + + struct + { + ULONG Length; + ULONG POINTER_ALIGNMENT Key; + LARGE_INTEGER ByteOffset; + void *ReadBuffer; + PMDL MdlAddress; + } Read; + + struct + { + ULONG Length; + ULONG POINTER_ALIGNMENT Key; + LARGE_INTEGER ByteOffset; + void *WriteBuffer; + PMDL MdlAddress; + } Write; + + struct + { + ULONG Length; + FILE_INFORMATION_CLASS POINTER_ALIGNMENT FileInformationClass; + void *InfoBuffer; + } QueryFileInformation; + + struct + { + ULONG Length; + FILE_INFORMATION_CLASS POINTER_ALIGNMENT FileInformationClass; + PFILE_OBJECT ParentOfTarget; + union + { + struct + { + BOOLEAN ReplaceIfExists; + BOOLEAN AdvanceOnly; + }; + ULONG ClusterCount; + HANDLE DeleteHandle; + }; + void *InfoBuffer; + } SetFileInformation; + + struct + { + ULONG Length; + void *EaList; + ULONG EaListLength; + ULONG POINTER_ALIGNMENT EaIndex; + void *EaBuffer; + PMDL MdlAddress; + } QueryEa; + + struct + { + ULONG Length; + void *EaBuffer; + PMDL MdlAddress; + } SetEa; + + struct + { + ULONG Length; + FS_INFORMATION_CLASS POINTER_ALIGNMENT FsInformationClass; + void *VolumeBuffer; + } QueryVolumeInformation; + + struct + { + ULONG Length; + FS_INFORMATION_CLASS POINTER_ALIGNMENT FsInformationClass; + void *VolumeBuffer; + } SetVolumeInformation; + + union + { + struct + { + ULONG Length; + PUNICODE_STRING FileName; + FILE_INFORMATION_CLASS FileInformationClass; + ULONG POINTER_ALIGNMENT FileIndex; + void *DirectoryBuffer; + PMDL MdlAddress; + } QueryDirectory; + + struct + { + ULONG Length; + ULONG POINTER_ALIGNMENT CompletionFilter; + ULONG POINTER_ALIGNMENT Spare1; + ULONG POINTER_ALIGNMENT Spare2; + void *DirectoryBuffer; + PMDL MdlAddress; + } NotifyDirectory; + + struct + { + ULONG Length; + ULONG POINTER_ALIGNMENT CompletionFilter; + DIRECTORY_NOTIFY_INFORMATION_CLASS POINTER_ALIGNMENT DirectoryNotifyInformationClass; + ULONG POINTER_ALIGNMENT Spare2; + void *DirectoryBuffer; + PMDL MdlAddress; + } NotifyDirectoryEx; + } DirectoryControl; + + union + { + struct + { + PVPB Vpb; + PDEVICE_OBJECT DeviceObject; + } VerifyVolume; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT FsControlCode; + } Common; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT FsControlCode; + void *InputBuffer; + void *OutputBuffer; + PMDL OutputMdlAddress; + } Neither; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT FsControlCode; + void *SystemBuffer; + } Buffered; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT FsControlCode; + void *InputSystemBuffer; + void *OutputBuffer; + PMDL OutputMdlAddress; + } Direct; + } FileSystemControl; + + union + { + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT IoControlCode; + } Common; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT IoControlCode; + void *InputBuffer; + void *OutputBuffer; + PMDL OutputMdlAddress; + } Neither; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT IoControlCode; + void *SystemBuffer; + } Buffered; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT IoControlCode; + void *InputSystemBuffer; + void *OutputBuffer; + PMDL OutputMdlAddress; + } Direct; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT IoControlCode; + void *InputBuffer; + void *OutputBuffer; + } FastIo; + } DeviceIoControl; + + struct + { + PLARGE_INTEGER Length; + ULONG POINTER_ALIGNMENT Key; + LARGE_INTEGER ByteOffset; + PEPROCESS ProcessId; + BOOLEAN FailImmediately; + BOOLEAN ExclusiveLock; + } LockControl; + + struct + { + SECURITY_INFORMATION SecurityInformation; + ULONG POINTER_ALIGNMENT Length; + void *SecurityBuffer; + PMDL MdlAddress; + } QuerySecurity; + + struct + { + SECURITY_INFORMATION SecurityInformation; + PSECURITY_DESCRIPTOR SecurityDescriptor; + } SetSecurity; + + struct + { + ULONG_PTR ProviderId; + void *DataPath; + ULONG BufferSize; + void *Buffer; + } WMI; + + struct + { + ULONG Length; + PSID StartSid; + PFILE_GET_QUOTA_INFORMATION SidList; + ULONG SidListLength; + void *QuotaBuffer; + PMDL MdlAddress; + } QueryQuota; + + struct + { + ULONG Length; + void *QuotaBuffer; + PMDL MdlAddress; + } SetQuota; + + union + { + struct + { + PCM_RESOURCE_LIST AllocatedResources; + PCM_RESOURCE_LIST AllocatedResourcesTranslated; + } StartDevice; + + struct + { + DEVICE_RELATION_TYPE Type; + } QueryDeviceRelations; + + struct + { + const GUID *InterfaceType; + USHORT Size; + USHORT Version; + PINTERFACE Interface; + void *InterfaceSpecificData; + } QueryInterface; + + struct + { + PDEVICE_CAPABILITIES Capabilities; + } DeviceCapabilities; + + struct + { + PIO_RESOURCE_REQUIREMENTS_LIST IoResourceRequirementList; + } FilterResourceRequirements; + + struct + { + ULONG WhichSpace; + void *Buffer; + ULONG Offset; + ULONG POINTER_ALIGNMENT Length; + } ReadWriteConfig; + + struct + { + BOOLEAN Lock; + } SetLock; + + struct { + BUS_QUERY_ID_TYPE IdType; + } QueryId; + + struct + { + DEVICE_TEXT_TYPE DeviceTextType; + LCID POINTER_ALIGNMENT LocaleId; + } QueryDeviceText; + + struct + { + BOOLEAN InPath; + BOOLEAN Reserved[3]; + DEVICE_USAGE_NOTIFICATION_TYPE POINTER_ALIGNMENT Type; + } UsageNotification; + } Pnp; + + struct + { + FS_FILTER_SECTION_SYNC_TYPE SyncType; + ULONG PageProtection; + PFS_FILTER_SECTION_SYNC_OUTPUT OutputInformation; + } AcquireForSectionSynchronization; + + struct + { + PLARGE_INTEGER EndingOffset; + PERESOURCE *ResourceToRelease; + } AcquireForModifiedPageWriter; + + struct + { + PERESOURCE ResourceToRelease; + } ReleaseForModifiedPageWriter; + + struct + { + PIRP Irp; + void *FileInformation; + PULONG Length; + FILE_INFORMATION_CLASS FileInformationClass; + } QueryOpen; + + struct + { + LARGE_INTEGER FileOffset; + ULONG Length; + ULONG POINTER_ALIGNMENT LockKey; + BOOLEAN POINTER_ALIGNMENT CheckForReadOperation; + } FastIoCheckIfPossible; + + struct + { + PIRP Irp; + PFILE_NETWORK_OPEN_INFORMATION NetworkInformation; + } NetworkQueryOpen; + + struct + { + LARGE_INTEGER FileOffset; + ULONG POINTER_ALIGNMENT Length; + ULONG POINTER_ALIGNMENT Key; + PMDL *MdlChain; + } MdlRead; + + struct + { + PMDL MdlChain; + } MdlReadComplete; + + struct + { + LARGE_INTEGER FileOffset; + ULONG POINTER_ALIGNMENT Length; + ULONG POINTER_ALIGNMENT Key; + PMDL *MdlChain; + } PrepareMdlWrite; + + struct + { + LARGE_INTEGER FileOffset; + PMDL MdlChain; + } MdlWriteComplete; + + struct + { + ULONG DeviceType; + } MountVolume; + + struct + { + void *Argument1; + void *Argument2; + void *Argument3; + void *Argument4; + void *Argument5; + LARGE_INTEGER Argument6; + } Others; + +} FLT_PARAMETERS, *PFLT_PARAMETERS; + +typedef struct _FLT_IO_PARAMETER_BLOCK +{ + ULONG IrpFlags; + UCHAR MajorFunction; + UCHAR MinorFunction; + UCHAR OperationFlags; + UCHAR Reserved; + PFILE_OBJECT TargetFileObject; + PFLT_INSTANCE TargetInstance; + FLT_PARAMETERS Parameters; + +} FLT_IO_PARAMETER_BLOCK, *PFLT_IO_PARAMETER_BLOCK; + +typedef struct _FLT_CALLBACK_DATA +{ + FLT_CALLBACK_DATA_FLAGS Flags; + PETHREAD const Thread; + PFLT_IO_PARAMETER_BLOCK const Iopb; + IO_STATUS_BLOCK IoStatus; + struct _FLT_TAG_DATA_BUFFER *TagData; + + union + { + struct + { + LIST_ENTRY QueueLinks; + void *QueueContext[2]; + }; + void *FilterContext[4]; + }; + KPROCESSOR_MODE RequestorMode; +} FLT_CALLBACK_DATA, *PFLT_CALLBACK_DATA; + +typedef void* (WINAPI *PFLT_CONTEXT_ALLOCATE_CALLBACK)(POOL_TYPE,SIZE_T,FLT_CONTEXT_TYPE); +typedef void (WINAPI *PFLT_CONTEXT_CLEANUP_CALLBACK)(PFLT_CONTEXT, FLT_CONTEXT_TYPE); +typedef void (WINAPI *PFLT_CONTEXT_FREE_CALLBACK)(void *, FLT_CONTEXT_TYPE); +typedef NTSTATUS (WINAPI *PFLT_FILTER_UNLOAD_CALLBACK)(FLT_FILTER_UNLOAD_FLAGS); +typedef NTSTATUS (WINAPI *PFLT_INSTANCE_QUERY_TEARDOWN_CALLBACK)(PCFLT_RELATED_OBJECTS, + FLT_INSTANCE_QUERY_TEARDOWN_FLAGS); +typedef NTSTATUS (WINAPI *PFLT_GENERATE_FILE_NAME)(PFLT_INSTANCE, PFILE_OBJECT,PFLT_CALLBACK_DATA, + FLT_FILE_NAME_OPTIONS,PBOOLEAN, PFLT_NAME_CONTROL); +typedef NTSTATUS (WINAPI *PFLT_INSTANCE_SETUP_CALLBACK)(PCFLT_RELATED_OBJECTS,FLT_INSTANCE_SETUP_FLAGS, + DEVICE_TYPE,FLT_FILESYSTEM_TYPE); +typedef void (WINAPI *PFLT_INSTANCE_TEARDOWN_CALLBACK)(PCFLT_RELATED_OBJECTS, FLT_INSTANCE_TEARDOWN_FLAGS); +typedef void (WINAPI *PFLT_NORMALIZE_CONTEXT_CLEANUP)(void**); +typedef NTSTATUS (WINAPI *PFLT_NORMALIZE_NAME_COMPONENT)(PFLT_INSTANCE, PCUNICODE_STRING, USHORT, + PCUNICODE_STRING,PFILE_NAMES_INFORMATION,ULONG,FLT_NORMALIZE_NAME_FLAGS, void **); +typedef NTSTATUS (WINAPI *PFLT_NORMALIZE_NAME_COMPONENT_EX)(PFLT_INSTANCE, PFILE_OBJECT, PCUNICODE_STRING, + USHORT, PCUNICODE_STRING,PFILE_NAMES_INFORMATION, ULONG, FLT_NORMALIZE_NAME_FLAGS Flags, + void **NormalizationContext); +typedef FLT_PREOP_CALLBACK_STATUS (WINAPI *PFLT_PRE_OPERATION_CALLBACK)(PFLT_CALLBACK_DATA, + PCFLT_RELATED_OBJECTS, void**); +typedef FLT_POSTOP_CALLBACK_STATUS (WINAPI *PFLT_POST_OPERATION_CALLBACK)(PFLT_CALLBACK_DATA, + PCFLT_RELATED_OBJECTS, void*, FLT_POST_OPERATION_FLAGS); +typedef NTSTATUS (WINAPI *PFLT_SECTION_CONFLICT_NOTIFICATION_CALLBACK)(PFLT_INSTANCE, PFLT_CONTEXT, + PFLT_CALLBACK_DATA); +typedef NTSTATUS (WINAPI *PFLT_TRANSACTION_NOTIFICATION_CALLBACK)(PCFLT_RELATED_OBJECTS, PFLT_CONTEXT, ULONG); + +typedef struct _FLT_CONTEXT_REGISTRATION +{ + FLT_CONTEXT_TYPE ContextType; + FLT_CONTEXT_REGISTRATION_FLAGS Flags; + PFLT_CONTEXT_CLEANUP_CALLBACK ContextCleanupCallback; + SIZE_T Size; + ULONG PoolTag; + PFLT_CONTEXT_ALLOCATE_CALLBACK ContextAllocateCallback; + PFLT_CONTEXT_FREE_CALLBACK ContextFreeCallback; + void* Reserved1; +} FLT_CONTEXT_REGISTRATION, *PFLT_CONTEXT_REGISTRATION; + +typedef const FLT_CONTEXT_REGISTRATION *PCFLT_CONTEXT_REGISTRATION; + +typedef struct _FLT_OPERATION_REGISTRATION +{ + UCHAR MajorFunction; + FLT_OPERATION_REGISTRATION_FLAGS Flags; + PFLT_PRE_OPERATION_CALLBACK PreOperation; + PFLT_POST_OPERATION_CALLBACK PostOperation; + void *Reserved1; +} FLT_OPERATION_REGISTRATION, *PFLT_OPERATION_REGISTRATION; + +typedef struct _FLT_REGISTRATION +{ + USHORT Size; + USHORT Version; + FLT_REGISTRATION_FLAGS Flags; + const FLT_CONTEXT_REGISTRATION *ContextRegistration; + const FLT_OPERATION_REGISTRATION *OperationRegistration; + PFLT_FILTER_UNLOAD_CALLBACK FilterUnloadCallback; + PFLT_INSTANCE_SETUP_CALLBACK InstanceSetupCallback; + PFLT_INSTANCE_QUERY_TEARDOWN_CALLBACK InstanceQueryTeardownCallback; + PFLT_INSTANCE_TEARDOWN_CALLBACK InstanceTeardownStartCallback; + PFLT_INSTANCE_TEARDOWN_CALLBACK InstanceTeardownCompleteCallback; + PFLT_GENERATE_FILE_NAME GenerateFileNameCallback; + PFLT_NORMALIZE_NAME_COMPONENT NormalizeNameComponentCallback; + PFLT_NORMALIZE_CONTEXT_CLEANUP NormalizeContextCleanupCallback; + PFLT_TRANSACTION_NOTIFICATION_CALLBACK TransactionNotificationCallback; + PFLT_NORMALIZE_NAME_COMPONENT_EX NormalizeNameComponentExCallback; + PFLT_SECTION_CONFLICT_NOTIFICATION_CALLBACK SectionNotificationCallback; +} FLT_REGISTRATION, *PFLT_REGISTRATION; + + +NTSTATUS WINAPI FltRegisterFilter (PDRIVER_OBJECT, const FLT_REGISTRATION *, PFLT_FILTER *); +NTSTATUS WINAPI FltStartFiltering (PFLT_FILTER); +void WINAPI FltUnregisterFilter (PFLT_FILTER); + +#ifdef __cplusplus +} +#endif + +#endif -- 1.9.1

1 0

[PATCH 6/6] bcrypt: Fix BCryptEncrypt with AES_GCM and no input and no output.
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c219c77..b503792 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1469,7 +1469,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp *ret_len = input_len; if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; - if (!output) return STATUS_SUCCESS; + if (input && !output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 2e0e57e..b35a479 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -640,6 +640,9 @@ static void test_BCryptEncrypt(void) {0x9a,0x92,0x32,0x2c,0x61,0x2a,0xae,0xef,0x66,0x2a,0xfb,0x55,0xe9,0x48,0xdf,0xbd}; static UCHAR expected_tag3[] = {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; + static UCHAR expected_tag4[] = + {0x4c,0x42,0x83,0x9e,0x8d,0x40,0xf1,0x19,0xd6,0x2b,0x1c,0x66,0x03,0x2b,0x39,0x63}; + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; UCHAR *buf, ciphertext[48], ivbuf[16], tag[16]; BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length; @@ -831,6 +834,21 @@ static void test_BCryptEncrypt(void) for (i = 0; i < 16; i++) ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 0, &auth_info, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 0, "got %u\n", size); + for (i = 0; i < 16; i++) + ok(tag[i] == 0xff, "%u: %02x != %02x\n", i, tag[i], 0xff); + + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, NULL, 0, &auth_info, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 0, "got %u\n", size); + ok(!memcmp(tag, expected_tag4, sizeof(expected_tag4)), "wrong tag\n"); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag4[i], "%u: %02x != %02x\n", i, tag[i], expected_tag4[i]); + /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); -- 1.9.1

1 0

[PATCH 5/6] bcrypt: Avoid crash in tests when compiling without gnutls support.
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 68bee84..c219c77 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1313,12 +1313,19 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (object) FIXME( "ignoring object buffer\n" ); - if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; + + if (!(key = heap_alloc( sizeof(*key) ))) + { + *handle = NULL; + return STATUS_NO_MEMORY; + } + key->hdr.magic = MAGIC_KEY; if ((status = key_init( key, alg, secret, secret_len ))) { heap_free( key ); + *handle = NULL; return status; } @@ -1401,11 +1408,15 @@ NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE if (!key_orig || key_orig->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; if (!handle_copy) return STATUS_INVALID_PARAMETER; if (!(key_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*key_copy) ))) + { + *handle_copy = NULL; return STATUS_NO_MEMORY; + } if ((status = key_duplicate( key_orig, key_copy ))) { HeapFree( GetProcessHeap(), 0, key_copy ); + *handle_copy = NULL; return status; } -- 1.9.1

1 0

[PATCH 4/6] bcrypt/tests: Add tests for auth data in AES GCM mode.
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/tests/bcrypt.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index f67a975..2e0e57e 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -610,7 +610,9 @@ static void test_BCryptGenerateSymmetricKey(void) static void test_BCryptEncrypt(void) { static UCHAR nonce[] = - {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60}; + {0x10,0x20,0x30,0x40,0x50,0x60,0x10,0x20,0x30,0x40,0x50,0x60}; + static UCHAR auth_data[] = + {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; static UCHAR secret[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; static UCHAR iv[] = @@ -636,6 +638,8 @@ static void test_BCryptEncrypt(void) {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR expected_tag2[] = {0x9a,0x92,0x32,0x2c,0x61,0x2a,0xae,0xef,0x66,0x2a,0xfb,0x55,0xe9,0x48,0xdf,0xbd}; + static UCHAR expected_tag3[] = + {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; UCHAR *buf, ciphertext[48], ivbuf[16], tag[16]; BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length; @@ -809,6 +813,24 @@ static void test_BCryptEncrypt(void) for (i = 0; i < 16; i++) ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); + /* test with auth data */ + auth_info.pbAuthData = auth_data; + auth_info.cbAuthData = sizeof(auth_data); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0xff, sizeof(ciphertext)); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(tag, expected_tag3, sizeof(expected_tag3)), "wrong tag\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); @@ -831,7 +853,9 @@ static void test_BCryptEncrypt(void) static void test_BCryptDecrypt(void) { static UCHAR nonce[] = - {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60}; + {0x10,0x20,0x30,0x40,0x50,0x60,0x10,0x20,0x30,0x40,0x50,0x60}; + static UCHAR auth_data[] = + {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; static UCHAR secret[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; static UCHAR iv[] = @@ -858,6 +882,8 @@ static void test_BCryptDecrypt(void) 0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94}; static UCHAR tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; + static UCHAR tag2[] = + {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; BCRYPT_KEY_LENGTHS_STRUCT key_lengths; BCRYPT_ALG_HANDLE aes; @@ -1007,6 +1033,20 @@ static void test_BCryptDecrypt(void) ok(size == 32, "got %u\n", size); ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + /* test with auuth data */ + auth_info.pbAuthData = auth_data; + auth_info.cbAuthData = sizeof(auth_data); + auth_info.pbTag = tag2; + auth_info.cbTag = sizeof(tag2); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + /* test with wrong tag */ memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ -- 1.9.1

1 0

[PATCH 3/6] bcrypt: Add support for auth data in AES GCM mode.
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c571db7..68bee84 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -52,6 +52,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Not present in gnutls version < 3.0 */ static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size); +static int (*pgnutls_cipher_add_auth)(gnutls_cipher_hd_t handle, const void *ptext, size_t ptext_size); static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -72,7 +73,12 @@ MAKE_FUNCPTR(gnutls_perror); #define GNUTLS_CIPHER_AES_256_GCM 94 #endif -static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void * tag, size_t tag_size) +static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void *tag, size_t tag_size) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + +static int compat_gnutls_cipher_add_auth(gnutls_cipher_hd_t handle, const void *ptext, size_t ptext_size) { return GNUTLS_E_UNKNOWN_CIPHER_TYPE; } @@ -115,6 +121,11 @@ static BOOL gnutls_initialize(void) WARN("gnutls_cipher_tag not found\n"); pgnutls_cipher_tag = compat_gnutls_cipher_tag; } + if (!(pgnutls_cipher_add_auth = wine_dlsym( libgnutls_handle, "gnutls_cipher_add_auth", NULL, 0 ))) + { + WARN("gnutls_cipher_add_auth not found\n"); + pgnutls_cipher_add_auth = compat_gnutls_cipher_add_auth; + } if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) { @@ -1021,6 +1032,19 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) return STATUS_SUCCESS; } +static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +{ + int ret; + + if ((ret = pgnutls_cipher_add_auth( key->handle, auth_data, len ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { @@ -1164,6 +1188,12 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) return STATUS_SUCCESS; } +static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { @@ -1231,6 +1261,12 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) { @@ -1425,6 +1461,8 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) + return status; if ((status = key_encrypt( key, input, input_len, output, output_len ))) return status; @@ -1502,6 +1540,8 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) + return status; if ((status = key_decrypt( key, input, input_len, output, output_len ))) return status; -- 1.9.1

1 0

[PATCH 2/6] bcrypt/tests: Add tests for BCryptDuplicateKey.
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/tests/bcrypt.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 9922e41..f67a975 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -45,6 +45,7 @@ static NTSTATUS (WINAPI *pBCryptEncrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID ULONG *, ULONG); static NTSTATUS (WINAPI *pBCryptDecrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptDuplicateKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); static NTSTATUS (WINAPI *pBCryptImportKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); @@ -503,7 +504,7 @@ static void test_BCryptGenerateSymmetricKey(void) static UCHAR expected[] = {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79}; BCRYPT_ALG_HANDLE aes; - BCRYPT_KEY_HANDLE key; + BCRYPT_KEY_HANDLE key, key2; UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16]; ULONG size, len, i; NTSTATUS ret; @@ -550,6 +551,35 @@ static void test_BCryptGenerateSymmetricKey(void) for (i = 0; i < 16; i++) ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + ret = pBCryptDuplicateKey(NULL, &key2, NULL, 0, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + if (0) /* crashes on some Windows versions */ + { + ret = pBCryptDuplicateKey(key, NULL, NULL, 0, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + } + + key2 = (void *)0xdeadbeef; + ret = pBCryptDuplicateKey(key, &key2, NULL, 0, 0); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER), "got %08x\n", ret); + + if (ret == STATUS_SUCCESS) + { + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key2, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(ciphertext, expected, sizeof(expected)), "wrong data\n"); + for (i = 0; i < 16; i++) + ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + + ret = pBCryptDestroyKey(key2); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + } + size = 0xdeadbeef; ret = pBCryptDecrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -1063,6 +1093,7 @@ START_TEST(bcrypt) pBCryptGenerateSymmetricKey = (void *)GetProcAddress(module, "BCryptGenerateSymmetricKey"); pBCryptEncrypt = (void *)GetProcAddress(module, "BCryptEncrypt"); pBCryptDecrypt = (void *)GetProcAddress(module, "BCryptDecrypt"); + pBCryptDuplicateKey = (void *)GetProcAddress(module, "BCryptDuplicateKey"); pBCryptDestroyKey = (void *)GetProcAddress(module, "BCryptDestroyKey"); pBCryptImportKey = (void *)GetProcAddress(module, "BCryptImportKey"); pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey"); -- 1.9.1

1 0

[PATCH 1/6] bcrypt: Implement BCryptDuplicateKey.
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 2 +- 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 21b54b4..28c2394 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -12,7 +12,7 @@ @ stdcall BCryptDestroyKey(ptr) @ stub BCryptDestroySecret @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) -@ stub BCryptDuplicateKey +@ stdcall BCryptDuplicateKey(ptr ptr ptr long long) @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) @ stdcall BCryptEnumAlgorithms(long ptr ptr long) @ stub BCryptEnumContextFunctionProviders diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index cd44bdf..c571db7 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -953,6 +953,24 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) +{ + UCHAR *buffer; + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, key_orig->secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->secret, key_orig->secret_len ); + + key_copy->hdr = key_orig->hdr; + key_copy->alg_id = key_orig->alg_id; + key_copy->mode = key_orig->mode; + key_copy->block_size = key_orig->block_size; + key_copy->handle = NULL; + key_copy->secret = buffer; + key_copy->secret_len = key_orig->secret_len; + + return STATUS_SUCCESS; +} + static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { switch (key->alg_id) @@ -1094,6 +1112,25 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) +{ + UCHAR *buffer; + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, key_orig->secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->secret, key_orig->secret_len ); + + key_copy->hdr = key_orig->hdr; + key_copy->alg_id = key_orig->alg_id; + key_copy->mode = key_orig->mode; + key_copy->block_size = key_orig->block_size; + key_copy->ref_encrypt = NULL; + key_copy->ref_decrypt = NULL; + key_copy->secret = buffer; + key_copy->secret_len = key_orig->secret_len; + + return STATUS_SUCCESS; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { CCCryptorStatus status; @@ -1182,6 +1219,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { ERR( "support for keys not available at build time\n" ); @@ -1310,6 +1353,30 @@ NTSTATUS WINAPI BCryptExportKey(BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE return key_export( key, type, output, output_len, size ); } +NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE *handle_copy, + UCHAR *object, ULONG object_len, ULONG flags ) +{ + struct key *key_orig = handle; + struct key *key_copy; + NTSTATUS status; + + TRACE( "%p, %p, %p, %u, %08x\n", handle, handle_copy, object, object_len, flags ); + + if (!key_orig || key_orig->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!handle_copy) return STATUS_INVALID_PARAMETER; + if (!(key_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*key_copy) ))) + return STATUS_NO_MEMORY; + + if ((status = key_duplicate( key_orig, key_copy ))) + { + HeapFree( GetProcessHeap(), 0, key_copy ); + return status; + } + + *handle_copy = key_copy; + return STATUS_SUCCESS; +} + NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) { struct key *key = handle; diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 5d5fae0..d0f0f56 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -14,7 +14,7 @@ @ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey @ stub BCryptDestroySecret @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash -@ stub BCryptDuplicateKey +@ stdcall BCryptDuplicateKey(ptr ptr ptr long long) bcrypt.BCryptDuplicateKey @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt @ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms @ stub BCryptEnumContextFunctionProviders -- 1.9.1

1 0

[PATCH] Test for the explorer.exe
by Carlos Vega García 22 Mar '18

22 Mar '18

--- configure | 1 + programs/explorer/tests/Makefile.in | 5 ++ programs/explorer/tests/explorer.c | 158 ++++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100755 programs/explorer/tests/Makefile.in create mode 100755 programs/explorer/tests/explorer.c diff --git a/configure b/configure index 6324574..9f36b54 100755 --- a/configure +++ b/configure @@ -19220,6 +19220,7 @@ wine_fn_config_makefile programs/dxdiag enable_dxdiag wine_fn_config_makefile programs/eject enable_eject wine_fn_config_makefile programs/expand enable_expand wine_fn_config_makefile programs/explorer enable_explorer +wine_fn_config_makefile programs/explorer/tests enable_tests wine_fn_config_makefile programs/extrac32 enable_extrac32 wine_fn_config_makefile programs/findstr enable_findstr wine_fn_config_makefile programs/fsutil enable_fsutil diff --git a/programs/explorer/tests/Makefile.in b/programs/explorer/tests/Makefile.in new file mode 100755 index 0000000..422465b --- /dev/null +++ b/programs/explorer/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = explorer.exe +IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi + +C_SRCS = \ + explorer.c diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c new file mode 100755 index 0000000..28e1ad3 --- /dev/null +++ b/programs/explorer/tests/explorer.c @@ -0,0 +1,158 @@ +/* + * Unit tests for explorer.exe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include <stdio.h> +#include <winbase.h> +#include "dde.h" +#include "ddeml.h" +#include "winuser.h" +#include "shlobj.h" + +static HRESULT (WINAPI *pSHGetLocalizedName)(LPCWSTR, LPWSTR, UINT, int *); + +static BOOL use_common(void) +{ + HMODULE hmod; + static BOOL (WINAPI *pIsNTAdmin)(DWORD, LPDWORD); + + /* IsNTAdmin() is available on all platforms. */ + hmod = LoadLibraryA("advpack.dll"); + pIsNTAdmin = (void*)GetProcAddress(hmod, "IsNTAdmin"); + + if (!pIsNTAdmin(0, NULL)) + { + /* We are definitely not an administrator */ + FreeLibrary(hmod); + return FALSE; + } + FreeLibrary(hmod); + + /* If we end up here we are on NT4+ as Win9x and WinMe don't have the + * notion of administrators (as we need it). + */ + + /* As of Vista we should always use the users directory. Tests with the + * real Administrator account on Windows 7 proved this. + * + * FIXME: We need a better way of identifying Vista+ as currently this check + * also covers Wine and we don't know yet which behavior we want to follow. + */ + if (pSHGetLocalizedName) + return FALSE; + + return TRUE; +} + +static BOOL full_title(void) +{ + CABINETSTATE cs; + + memset(&cs, 0, sizeof(cs)); + ReadCabinetState(&cs, sizeof(cs)); + + return (cs.fFullPathTitle == -1); +} + + +static char ProgramsDir[MAX_PATH]; +static void init_strings(void) +{ + char commonprograms[MAX_PATH]; + char programs[MAX_PATH]; + + SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); + + /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before Vista + * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) or + * not (CSIDL_PROGRAMS). + */ + + if (use_common()) + lstrcpyA(ProgramsDir, commonprograms); + else + lstrcpyA(ProgramsDir, programs); +} + + + +static BOOL check_window_exists(const char *name) +{ + char title[MAX_PATH]; + HWND window = NULL; + int i; + + if (full_title()) + { + strcpy(title, ProgramsDir); + strcat(title, "\\"); + strcat(title, name); + } + else + strcpy(title, name); + + trace("\n \n Window name: %s \n \n",name); + for (i = 0; i < 20; i++) + { + Sleep(20 + 20*i); + if ((window = FindWindowA("ExplorerWClass", title)) || + (window = FindWindowA("CabinetWClass", title))) + { + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; + } + } + + return (window != NULL); +} + + + +/* +*We make a call to open a new explorer window and we test if it finally opens. +*/ +int explorer_available(void) +{ + STARTUPINFOA si; + PROCESS_INFORMATION pi; + LPDWORD lpExitCode; + char cmd[] = {'e','x','p','l','o','r','e','r',' ','/','r','o','o','t',0}; + char windowName[] = {'r','o','o','t',0}; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + /*Checks if the window has been created*/ + if (check_window_exists(windowName)) { + + return TRUE; + + } + return FALSE; +} + +START_TEST(explorer) +{ + init_strings(); + + ok(explorer_available() == TRUE, "explorer is not avaible \n"); + trace("\n Test Done \n "); + +} -- 2.7.4

2 1

[PATCH v2] user32/tests: Fix broadcast test failures on Windows 10
by Alex Henrie 22 Mar '18

22 Mar '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Simply remove the invalid flags tests as Huw suggested dlls/user32/tests/broadcast.c | 60 +++++++++++-------------------------------- 1 file changed, 15 insertions(+), 45 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index afdb536816..2dfdc98b34 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -128,13 +128,6 @@ if (0) /* TODO: Check the hang flags */ ok(0, "Returned: %d\n", ret); } - recips = BSM_APPLICATIONS; - ResetEvent(hevent); - ret = broadcast( BSF_POSTMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, 0 ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - SetLastError( 0xdeadbeef ); recips = BSM_APPLICATIONS; ret = broadcast( BSF_POSTMESSAGE|BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, 0 ); @@ -147,18 +140,6 @@ if (0) /* TODO: Check the hang flags */ ok(ret==1, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); - ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( 0, &recips, WM_NULL, 100, 0 ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); } /* BSF_SENDNOTIFYMESSAGE and BSF_QUERY are both synchronous within the same process @@ -209,13 +190,6 @@ if (0) /* TODO: Check the hang flags */ ok(0, "Returned: %d\n", ret); } - recips = BSM_APPLICATIONS; - ResetEvent(hevent); - ret = broadcastex( BSF_POSTMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - recips = BSM_APPLICATIONS; ret = broadcastex( BSF_POSTMESSAGE|BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, 0, NULL ); ok(ret==1, "Returned: %d\n", ret); @@ -227,18 +201,6 @@ if (0) /* TODO: Check the hang flags */ ok(ret==1, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcastex( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY, NULL ); - ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcastex( 0, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); } static void test_noprivileges(void) @@ -266,8 +228,10 @@ static void test_noprivileges(void) recips = BSM_ALLDESKTOPS; ResetEvent(hevent); ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + ok((ret == 1 && WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT) || + (ret == 0 && WaitForSingleObject(hevent, 1000) == WAIT_TIMEOUT) /* win10 */, + "Asynchronous message sent instead of synchronous message or no message. Returned: %d error %08x\n", + ret, GetLastError()); ok(recips == BSM_ALLDESKTOPS || recips == BSM_ALL_RECIPS, /* win2k3 */ "Received by: %08x\n", recips); @@ -277,8 +241,10 @@ static void test_noprivileges(void) recips = BSM_ALLCOMPONENTS; ResetEvent(hevent); ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + ok((ret == 1 && WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT) || + (ret == 0 && WaitForSingleObject(hevent, 1000) == WAIT_TIMEOUT) /* win10 */, + "Asynchronous message sent instead of synchronous message or no message. Returned: %d error %08x\n", + ret, GetLastError()); ok(recips == BSM_ALLCOMPONENTS || recips == BSM_ALL_RECIPS, /* win2k3 */ "Received by: %08x\n", recips); @@ -288,8 +254,10 @@ static void test_noprivileges(void) recips = BSM_ALLDESKTOPS|BSM_APPLICATIONS; ResetEvent(hevent); ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + ok((ret == 1 && WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT) || + (ret == 0 && WaitForSingleObject(hevent, 1000) == WAIT_TIMEOUT) /* win10 */, + "Asynchronous message sent instead of synchronous message or no message. Returned: %d error %08x\n", + ret, GetLastError()); ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || recips == BSM_APPLICATIONS, /* win2k3 */ "Received by: %08x\n", recips); @@ -300,7 +268,9 @@ static void test_noprivileges(void) ResetEvent(hevent); ret = BroadcastSystemMessageExW( BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY, NULL ); ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT || + WaitForSingleObject(hevent, 1000) == WAIT_TIMEOUT /* win10 */, + "Asynchronous message sent instead of synchronous message or no message\n"); ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || recips == BSM_APPLICATIONS, /* win2k3 */ "Received by: %08x\n", recips); -- 2.16.2

1 0

[PATCH] testbot: Standardize and clean up the Collections initialization.
by Francois Gouget 22 Mar '18

22 Mar '18

@PropertyDescriptors does not need to be exported and it does not need to be initialized in a BEGIN block. Add documentation for the CreateXxx() functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Branches.pm | 25 +++++++++----- testbot/lib/WineTestBot/CGI/Sessions.pm | 40 +++++++++++++--------- testbot/lib/WineTestBot/Jobs.pm | 44 ++++++++++++++----------- testbot/lib/WineTestBot/Patches.pm | 51 ++++++++++++++++------------- testbot/lib/WineTestBot/PendingPatchSets.pm | 40 ++++++++++++---------- testbot/lib/WineTestBot/PendingPatches.pm | 28 +++++++++++----- testbot/lib/WineTestBot/RecordGroups.pm | 27 +++++++++------ testbot/lib/WineTestBot/Records.pm | 32 +++++++++--------- testbot/lib/WineTestBot/Roles.pm | 24 +++++++++----- testbot/lib/WineTestBot/Steps.pm | 44 ++++++++++++++++--------- testbot/lib/WineTestBot/StepsTasks.pm | 37 ++++++++++----------- testbot/lib/WineTestBot/Tasks.pm | 36 ++++++++++++-------- testbot/lib/WineTestBot/UserRoles.pm | 24 +++++++++----- testbot/lib/WineTestBot/Users.pm | 34 +++++++++++-------- testbot/lib/WineTestBot/VMs.pm | 45 ++++++++++++++----------- 15 files changed, 314 insertions(+), 217 deletions(-) diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index f5bd9d982..a67832590 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -53,7 +53,7 @@ WineTestBot::Branches - A collection of WineTestBot::Branch objects use ObjectModel::BasicPropertyDescriptor; use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT @PropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @@ -71,14 +71,6 @@ sub GetDefaultBranch($) return undef; } -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "Branch name", 1, 1, "A", 20), - CreateBasicPropertyDescriptor("IsDefault", "Default branch", !1, 1, "B", 1), - ); -} - sub MultipleBranchesPresent($) { my ($self) = @_; @@ -93,6 +85,21 @@ sub CreateItem($) return WineTestBot::Branch->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Name", "Branch name", 1, 1, "A", 20), + CreateBasicPropertyDescriptor("IsDefault", "Default branch", !1, 1, "B", 1), +); + +=pod +=over 12 + +=item C<CreateBranches()> + +Creates a collection of Branch objects. + +=back +=cut + sub CreateBranches(;$) { my ($ScopeObject) = @_; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 4b1f6b3c4..87fd15fb2 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -61,20 +61,12 @@ use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateSessions &DeleteSessions &NewSession); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Session id", 1, 1, "A", 32), - CreateItemrefPropertyDescriptor("User", "User", !1, 1, \&CreateUsers, ["UserName"]), - CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), - ); -} sub CreateItem($) { @@ -83,6 +75,29 @@ sub CreateItem($) return WineTestBot::CGI::Session->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Session id", 1, 1, "A", 32), + CreateItemrefPropertyDescriptor("User", "User", !1, 1, \&CreateUsers, ["UserName"]), + CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), +); + +=pod +=over 12 + +=item C<CreateSessions()> + +Creates a collection of Session objects. + +=back +=cut + +sub CreateSessions(;$) +{ + my ($ScopeObject) = @_; + return WineTestBot::CGI::Sessions->new("Sessions", "Sessions", "Session", + \@PropertyDescriptors, $ScopeObject); +} + sub DeleteNonPermanentSessions($) { my ($User) = @_; @@ -129,11 +144,4 @@ sub NewSession($$$) return ($ErrMessage, $Session); } -sub CreateSessions(;$) -{ - my ($ScopeObject) = @_; - return WineTestBot::CGI::Sessions->new("Sessions", "Sessions", "Session", - \@PropertyDescriptors, $ScopeObject); -} - 1; diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 1d0f8bb8f..bcbcae91f 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -404,30 +404,12 @@ use WineTestBot::Steps; use WineTestBot::Users; use WineTestBot::VMs; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateJobs &ScheduleJobs &CheckJobs); -my @PropertyDescriptors; - -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Job id", 1, 1, "S", 5), - CreateBasicPropertyDescriptor("Archived", "Job is archived", !1, 1, "B", 1), - CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), - CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&WineTestBot::Users::CreateUsers, ["UserName"]), - CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), - CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled']), - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), - CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), - CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), - CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, \&CreateSteps), - ); -} sub CreateItem($) { @@ -436,6 +418,30 @@ sub CreateItem($) return WineTestBot::Job->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Job id", 1, 1, "S", 5), + CreateBasicPropertyDescriptor("Archived", "Job is archived", !1, 1, "B", 1), + CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), + CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&WineTestBot::Users::CreateUsers, ["UserName"]), + CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), + CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled']), + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), + CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), + CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), + CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, \&CreateSteps), +); + +=pod +=over 12 + +=item C<CreateJobs()> + +Creates a collection of Job objects. + +=back +=cut + sub CreateJobs(;$) { my ($ScopeObject) = @_; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a1d963529..7906f1cb6 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -375,22 +375,6 @@ require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreatePatches); -my @PropertyDescriptors; - -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Patch id", 1, 1, "S", 7), - CreateBasicPropertyDescriptor("WebPatchId", "Wine Web Patch id", !1, !1, "N", 7), - CreateBasicPropertyDescriptor("Received", "Received", !1, 1, "DT", 19), - CreateBasicPropertyDescriptor("AffectsTests", "Affects tests", !1, 1, "B", 1), - CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40), - CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40), - CreateBasicPropertyDescriptor("Subject", "Subject", !1, !1, "A", 120), - CreateBasicPropertyDescriptor("MessageId", "Message id", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("Disposition", "Disposition", !1, 1, "A", 40), - ); -} sub CreateItem($) { @@ -399,6 +383,35 @@ sub CreateItem($) return WineTestBot::Patch->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Patch id", 1, 1, "S", 7), + CreateBasicPropertyDescriptor("WebPatchId", "Wine Web Patch id", !1, !1, "N", 7), + CreateBasicPropertyDescriptor("Received", "Received", !1, 1, "DT", 19), + CreateBasicPropertyDescriptor("AffectsTests", "Affects tests", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40), + CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40), + CreateBasicPropertyDescriptor("Subject", "Subject", !1, !1, "A", 120), + CreateBasicPropertyDescriptor("MessageId", "Message id", !1, !1, "A", 256), + CreateBasicPropertyDescriptor("Disposition", "Disposition", !1, 1, "A", 40), +); + +=pod +=over 12 + +=item C<CreatePatches()> + +Creates a collection of Patch objects. + +=back +=cut + +sub CreatePatches(;$) +{ + my ($ScopeObject) = @_; + return WineTestBot::Patches->new("Patches", "Patches", "Patch", + \@PropertyDescriptors, $ScopeObject); +} + sub IsPatch($$) { my ($self, $Body) = @_; @@ -539,10 +552,4 @@ sub NewPatch($$$) return undef; } -sub CreatePatches(;$) -{ - my ($ScopeObject) = @_; - return WineTestBot::Patches->new("Patches", "Patches", "Patch", \@PropertyDescriptors, $ScopeObject); -} - 1; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 5aae58338..520fb653c 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -161,22 +161,12 @@ use WineTestBot::Patches; use WineTestBot::Utils; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreatePendingPatchSets); -my @PropertyDescriptors; - -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("EMail", "EMail of series author", 1, 1, "A", 40), - CreateBasicPropertyDescriptor("TotalParts", "Expected number of parts in series", 1, 1, "N", 2), - CreateDetailrefPropertyDescriptor("Parts", "Parts received so far", !1, !1, \&CreatePendingPatches), - ); -} sub CreateItem($) { @@ -185,6 +175,28 @@ sub CreateItem($) return WineTestBot::PendingPatchSet->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("EMail", "EMail of series author", 1, 1, "A", 40), + CreateBasicPropertyDescriptor("TotalParts", "Expected number of parts in series", 1, 1, "N", 2), + CreateDetailrefPropertyDescriptor("Parts", "Parts received so far", !1, !1, \&CreatePendingPatches), +); + +=pod +=over 12 + +=item C<CreatePendingPatchSets()> + +Creates a collection of PendingPatchSet objects. + +=back +=cut + +sub CreatePendingPatchSets(;$) +{ + my ($ScopeObject) = @_; + return WineTestBot::PendingPatchSets->new("PendingPatchSets", "PendingPatchSets", "PendingPatchSet", \@PropertyDescriptors, $ScopeObject); +} + =pod =over 12 @@ -323,10 +335,4 @@ sub CheckForCompleteSet($) return $ErrMessage; } -sub CreatePendingPatchSets(;$) -{ - my ($ScopeObject) = @_; - return WineTestBot::PendingPatchSets->new("PendingPatchSets", "PendingPatchSets", "PendingPatchSet", \@PropertyDescriptors, $ScopeObject); -} - 1; diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index d63ff7e7d..053f7123d 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -51,19 +51,12 @@ use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Patches; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreatePendingPatches); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("No", "Part no", 1, 1, "N", 2), - CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", !1, 1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), - ); -} sub CreateItem($) { @@ -72,11 +65,28 @@ sub CreateItem($) return WineTestBot::PendingPatch->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("No", "Part no", 1, 1, "N", 2), + CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", !1, 1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), +); + +=pod +=over 12 + +=item C<CreatePendingPatches()> + +Creates a collection of PendingPatch objects. + +=back +=cut + sub CreatePendingPatches(;$$) { my ($ScopeObject, $PendingPatchSet) = @_; - return WineTestBot::PendingPatches->new("PendingPatches", "PendingPatches", "PendingPatch", \@PropertyDescriptors, $ScopeObject, $PendingPatchSet); + return WineTestBot::PendingPatches->new( + "PendingPatches", "PendingPatches", "PendingPatch", + \@PropertyDescriptors, $ScopeObject, $PendingPatchSet); } 1; diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index dfa83aeac..49c1758a0 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -61,22 +61,13 @@ use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::WineTestBotObjects; use WineTestBot::Records; -use vars qw (@ISA @EXPORT @PropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateRecordGroups &CompareRecordGroups &SaveRecord); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Group id", 1, 1, "S", 6), - CreateBasicPropertyDescriptor("Timestamp", "Timestamp", !1, 1, "DT", 19), - CreateDetailrefPropertyDescriptor("Records", "Records", !1, !1, \&CreateRecords), - ); -} - sub CreateItem($) { my ($self) = @_; @@ -84,6 +75,22 @@ sub CreateItem($) return WineTestBot::RecordGroup->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Group id", 1, 1, "S", 6), + CreateBasicPropertyDescriptor("Timestamp", "Timestamp", !1, 1, "DT", 19), + CreateDetailrefPropertyDescriptor("Records", "Records", !1, !1, \&CreateRecords), +); + +=pod +=over 12 + +=item C<CreateRecordGroups()> + +Creates a collection of RecordGroup objects. + +=back +=cut + sub CreateRecordGroups(;$) { my ($ScopeObject) = @_; diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index 46cf1fe43..98d5ee7d9 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -66,26 +66,13 @@ use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT @PropertyDescriptors @FlatPropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateRecords); -BEGIN -{ - @PropertyDescriptors = ( - CreateEnumPropertyDescriptor("Type", "Type", 1, 1, ['engine', 'tasks', 'vmresult', 'vmstatus']), - CreateBasicPropertyDescriptor("Name", "Name", 1, 1, "A", 96), - CreateBasicPropertyDescriptor("Value", "Value", !1, !1, "A", 64), - ); - @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("RecordGroupId", "Record group id", 1, 1, "S", 6), - @PropertyDescriptors - ); -} - sub CreateItem($) { my ($self) = @_; @@ -93,15 +80,26 @@ sub CreateItem($) return WineTestBot::Record->new($self); } +my @PropertyDescriptors = ( + CreateEnumPropertyDescriptor("Type", "Type", 1, 1, ['engine', 'tasks', 'vmresult', 'vmstatus']), + CreateBasicPropertyDescriptor("Name", "Name", 1, 1, "A", 96), + CreateBasicPropertyDescriptor("Value", "Value", !1, !1, "A", 64), +); +my @FlatPropertyDescriptors = ( + CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "S", 6), + @PropertyDescriptors +); + =pod =over 12 =item C<CreateRecords()> -Creates a collection containing the records of the specified RecordGroup. In -this case the Record objects have no RecordGroupId property. +When given a RecordGroup object returns a collection containing the +corresponding records. In this case the Record objects don't store the key of +their parent. -If no RecordGroup is specified all the table records are returned and the +If no RecordGroup object is specified all the table rows are returned and the Record objects have a RecordGroupId property. =back diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index eed13c301..a617ac14e 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -48,19 +48,12 @@ WineTestBot::Roles - A collection of WineTestBot::Role objects use ObjectModel::BasicPropertyDescriptor; use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT @PropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateRoles); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "Role name", 1, 1, "A", 20), - CreateBasicPropertyDescriptor("IsDefaultRole", "Should new users get this role by default", !1, 1, "B", 1), - ); -} sub CreateItem($) { @@ -69,6 +62,21 @@ sub CreateItem($) return WineTestBot::Role->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Name", "Role name", 1, 1, "A", 20), + CreateBasicPropertyDescriptor("IsDefaultRole", "Should new users get this role by default", !1, 1, "B", 1), +); + +=pod +=over 12 + +=item C<CreateRoles()> + +Creates a collection of Role objects. + +=back +=cut + sub CreateRoles(;$) { my ($ScopeObject) = @_; diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index b8dbaecb8..f91b70e3f 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -190,27 +190,12 @@ use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Tasks; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateSteps); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("No", "Step no", 1, 1, "N", 2), - CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), - CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), - CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), - CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['exe32', 'exe64', 'patchdlls', 'patchprograms']), - CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1), - CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), - CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), - ); -} sub CreateItem($) { @@ -219,6 +204,33 @@ sub CreateItem($) return WineTestBot::Step->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("No", "Step no", 1, 1, "N", 2), + CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), + CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), + CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), + CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), + CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['exe32', 'exe64', 'patchdlls', 'patchprograms']), + CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), + CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), +); + +=pod +=over 12 + +=item C<CreateSteps()> + +Creates a collection containing the steps of the specified Job. In +this case the Step objects don't store the key of their parent. + +If no Job is specified all the table rows are returned and the +Step objects have a JobId property. + +=back +=cut + sub CreateSteps(;$$) { my ($ScopeObject, $Job) = @_; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 79216d4e1..aea4654f4 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -102,31 +102,12 @@ use WineTestBot::Tasks; use WineTestBot::VMs; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateStepsTasks); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), - CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("TaskNo", "Task no", ! 1, 1, "N", 2), - CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 6), - CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 9), - CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), - CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 64), - CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 64), - CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 5), - ); -} - sub _initialize($$) { my ($self, $Job) = @_; @@ -181,6 +162,22 @@ sub CreateItem($) return WineTestBot::StepTask->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), + CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("TaskNo", "Task no", ! 1, 1, "N", 2), + CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 6), + CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 9), + CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), + CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), + CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 64), + CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 64), + CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), + CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 5), +); + sub CreateStepsTasks(;$$) { my ($ScopeObject, $Job) = @_; diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 373da5372..dcc222b52 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -209,25 +209,12 @@ use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::VMs; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateTasks); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("No", "Task no", 1, 1, "N", 2), - CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), - CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), - CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), - ); -} sub CreateItem($) { @@ -236,6 +223,27 @@ sub CreateItem($) return WineTestBot::Task->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("No", "Task no", 1, 1, "N", 2), + CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), + CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), + CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), + CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), + CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), +); + +=pod +=over 12 + +=item C<CreateTasks()> + +Creates a collection of Patch objects. + +=back +=cut + sub CreateTasks(;$$) { my ($ScopeObject, $Step) = @_; diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 8f7899a9e..417baf994 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -40,23 +40,17 @@ WineTestBot::UserRoles - A collection of WineTestBot::UserRole objects =cut +use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Roles; use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT @PropertyDescriptors); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateUserRoles); -BEGIN -{ - @PropertyDescriptors = ( - CreateItemrefPropertyDescriptor("Role", "Role", 1, 1, \&CreateRoles, ["RoleName"]), - ); - -} sub CreateItem($) { @@ -65,6 +59,20 @@ sub CreateItem($) return WineTestBot::UserRole->new($self); } +my @PropertyDescriptors = ( + CreateItemrefPropertyDescriptor("Role", "Role", 1, 1, \&CreateRoles, ["RoleName"]), +); + +=pod +=over 12 + +=item C<CreateUserRoles()> + +Creates a collection of UserRole objects. + +=back +=cut + sub CreateUserRoles(;$$) { my ($ScopeObject, $User) = @_; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index b9745d804..ec89f9b16 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -303,24 +303,12 @@ use WineTestBot::Config; use WineTestBot::UserRoles; use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT @PropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateUsers &GetBatchUser &Authenticate); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "Username", 1, 1, "A", 40), - CreateBasicPropertyDescriptor("EMail", "EMail", !1, 1, "A", 40), - CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['active', 'disabled', 'deleted']), - CreateBasicPropertyDescriptor("Password", "Password", !1, 1, "A", 49), - CreateBasicPropertyDescriptor("RealName", "Real name", !1, !1, "A", 40), - CreateBasicPropertyDescriptor("ResetCode", "Password reset code", !1, !1, "A", 32), - CreateDetailrefPropertyDescriptor("Roles", "Roles", !1, !1, \&CreateUserRoles), - ); -} sub CreateItem($) { @@ -329,6 +317,26 @@ sub CreateItem($) return WineTestBot::User->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Name", "Username", 1, 1, "A", 40), + CreateBasicPropertyDescriptor("EMail", "EMail", !1, 1, "A", 40), + CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['active', 'disabled', 'deleted']), + CreateBasicPropertyDescriptor("Password", "Password", !1, 1, "A", 49), + CreateBasicPropertyDescriptor("RealName", "Real name", !1, !1, "A", 40), + CreateBasicPropertyDescriptor("ResetCode", "Password reset code", !1, !1, "A", 32), + CreateDetailrefPropertyDescriptor("Roles", "Roles", !1, !1, \&CreateUserRoles), +); + +=pod +=over 12 + +=item C<CreateUsers()> + +Creates a collection of User objects. + +=back +=cut + sub CreateUsers(;$) { my ($ScopeObject) = @_; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 35bbe2a59..e93208201 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -639,31 +639,13 @@ use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT @PropertyDescriptors); +use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); @EXPORT = qw(&CreateVMs); -BEGIN -{ - @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "VM name", 1, 1, "A", 20), - CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), - CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), - CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), - CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), - CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), - CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), - CreateBasicPropertyDescriptor("VirtDomain", "LibVirt Domain for the VM", !1, 1, "A", 32), - CreateBasicPropertyDescriptor("IdleSnapshot", "Name of idle snapshot", !1, 1, "A", 32), - CreateBasicPropertyDescriptor("Hostname", "The VM hostname", !1, 1, "A", 64), - CreateBasicPropertyDescriptor("Description", "Description", !1, !1, "A", 40), - CreateBasicPropertyDescriptor("Details", "VM configuration details", !1, !1, "A", 512), - ); -} - sub CreateItem($) { my ($self) = @_; @@ -671,6 +653,31 @@ sub CreateItem($) return WineTestBot::VM->new($self); } +my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Name", "VM name", 1, 1, "A", 20), + CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), + CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), + CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), + CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), + CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), + CreateBasicPropertyDescriptor("VirtDomain", "LibVirt Domain for the VM", !1, 1, "A", 32), + CreateBasicPropertyDescriptor("IdleSnapshot", "Name of idle snapshot", !1, 1, "A", 32), + CreateBasicPropertyDescriptor("Hostname", "The VM hostname", !1, 1, "A", 64), + CreateBasicPropertyDescriptor("Description", "Description", !1, !1, "A", 40), + CreateBasicPropertyDescriptor("Details", "VM configuration details", !1, !1, "A", 512), +); + +=pod +=over 12 + +=item C<CreateVMs()> + +Creates a collection of VM objects. + +=back +=cut + sub CreateVMs(;$) { my ($ScopeObject) = @_; -- 2.16.2

1 0

[PATCH] testbot/Janitor: Add --dry-run and --log-only options.
by Francois Gouget 22 Mar '18

22 Mar '18

Janitor.pl now prints informational messages to stdout by default. This helps with debugging. The old behavior can be restored by using the --log-only option, like with the other TestBot tools. One can now also invoke it with the --dry-run option to see what it would do. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- You can add --log-only to the relevant crontab line if this causes any inconvenience. testbot/bin/Janitor.pl | 141 ++++++++++++++++++++++++++++++++++-------------- testbot/doc/INSTALL.txt | 2 +- 2 files changed, 101 insertions(+), 42 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 41f88d9e7..56e024a67 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -37,6 +37,8 @@ sub BEGIN unshift @INC, "$::RootDir/lib"; } } +my $Name0 = $0; +$Name0 =~ s+^.*/++; use File::Path; @@ -50,10 +52,61 @@ use WineTestBot::RecordGroups; use WineTestBot::Users; use WineTestBot::VMs; +my $LogOnly; +sub Trace(@) +{ + print @_ if (!$LogOnly); + LogMsg @_; +} + +sub Error(@) +{ + print STDERR "$Name0:error: ", @_ if (!$LogOnly); + LogMsg @_; +} + + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; +# Grab the command line options +my ($Usage, $DryRun); +while (@ARGV) +{ + my $Arg = shift @ARGV; + if ($Arg eq "--dry-run") + { + $DryRun = 1; + } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } + elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + { + $Usage = 0; + last; + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } +} +# Check parameters +if (defined $Usage) +{ + print "Usage: $Name0 [--dry-run] [--log-only] [--help]\n"; + exit $Usage; +} + + +# +# Main +# + # Delete obsolete Jobs if ($JobPurgeDays != 0) { @@ -61,13 +114,12 @@ if ($JobPurgeDays != 0) $Jobs->AddFilter("Submitted", [time() - $JobPurgeDays * 86400], "<"); foreach my $Job (@{$Jobs->GetItems()}) { - LogMsg "Deleting job ", $Job->Id, "\n"; + Trace "Deleting job ", $Job->Id, "\n"; + next if ($DryRun); + $Job->RmTree(); my $ErrMessage = $Jobs->DeleteItem($Job); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + Error "$ErrMessage\n" if (defined $ErrMessage); } } @@ -89,7 +141,9 @@ foreach my $Set (@{$Sets->GetItems()}) if (! defined($MostRecentPatch) || $MostRecentPatch->Received < $DeleteBefore) { - LogMsg "Deleting pending series for ", $Set->EMail, "\n"; + Error "Deleting pending series for ", $Set->EMail, "\n"; + next if ($DryRun); + $Sets->DeleteItem($Set); $MostRecentPatch->Disposition("Incomplete series, discarded"); $MostRecentPatch->Save(); @@ -107,13 +161,12 @@ if ($JobPurgeDays != 0) $Jobs->AddFilter("Patch", [$Patch]); if ($Jobs->IsEmpty()) { - LogMsg "Deleting patch ", $Patch->Id, "\n"; + Trace "Deleting patch ", $Patch->Id, "\n"; + next if ($DryRun); + unlink("$DataDir/patches/" . $Patch->Id); my $ErrMessage = $Patches->DeleteItem($Patch); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + Error "$ErrMessage\n" if (defined $ErrMessage); } } } @@ -128,7 +181,9 @@ if ($JobArchiveDays != 0) { if (defined($Job->Ended) && $Job->Ended < $ArchiveBefore) { - LogMsg "Archiving job ", $Job->Id, "\n"; + Trace "Archiving job ", $Job->Id, "\n"; + next if ($DryRun); + foreach my $Step (@{$Job->Steps->GetItems()}) { unlink $Step->GetDir() . "/" . $Step->FileName; @@ -157,7 +212,7 @@ if (%DeletedUsers or %DeletedVMs) { if (exists $DeletedUsers{$Job->User->Name}) { - LogMsg "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; + Trace "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; delete $DeletedUsers{$Job->User->Name}; } @@ -169,7 +224,7 @@ if (%DeletedUsers or %DeletedVMs) { if (exists $DeletedVMs{$Task->VM->Name}) { - LogMsg "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; + Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; delete $DeletedVMs{$Task->VM->Name}; } } @@ -182,15 +237,14 @@ if (%DeletedUsers or %DeletedVMs) foreach my $UserName (keys %DeletedUsers) { my $User = $Users->GetItem($UserName); + Trace "Deleting the $UserName account\n"; + next if ($DryRun); + DeleteSessions($User); my $ErrMessage = $Users->DeleteItem($User); if (defined $ErrMessage) { - LogMsg "Unable to delete the $UserName account: $ErrMessage\n"; - } - else - { - LogMsg "Deleted the $UserName account\n"; + Error "Unable to delete the $UserName account: $ErrMessage\n"; } } } @@ -198,14 +252,13 @@ if (%DeletedUsers or %DeletedVMs) foreach my $VMKey (keys %DeletedVMs) { my $VM = $VMs->GetItem($VMKey); + Trace "Deleting the $VMKey VM\n"; + next if ($DryRun); + my $ErrMessage = $VMs->DeleteItem($VM); if (defined $ErrMessage) { - LogMsg "Unable to delete the $VMKey VM: $ErrMessage\n"; - } - else - { - LogMsg "Deleted the $VMKey VM\n"; + Error "Unable to delete the $VMKey VM: $ErrMessage\n"; } } } @@ -223,41 +276,43 @@ if (opendir(my $dh, "$DataDir/staging")) my $FileName = "$DataDir/staging/$1"; my $Age = int((-M $FileName) + 0.5); - if ($Entry =~ /^[0-9a-f]{32}-websubmit_/) - { - if ($Age >= 1 and !unlink $FileName) - { - # The user abandoned the submit procedure half-way through - LogMsg "Could not delete '$FileName': $!\n" if (!unlink($FileName)); - } - } - else + if ($Entry !~ /^[0-9a-f]{32}-websubmit_/) { if ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) { - LogMsg "Found a suspicious staging file: $Entry\n"; + Trace "Found a suspicious staging file: $Entry\n"; } if ($JobPurgeDays != 0) { if ($Age >= $JobPurgeDays + 7) { - if (!rmtree($FileName)) + Trace "Deleting '$FileName'\n"; + if (!$DryRun and !rmtree($FileName)) { - LogMsg "Could not delete '$FileName': $!\n"; + Error "Could not delete '$FileName': $!\n"; } } elsif ($Age > $JobPurgeDays) { - LogMsg "'$FileName' is $Age days old and should have been deleted already. It will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; + Error "'$FileName' is $Age days old and should have been deleted already. It will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; } } } + elsif ($Age >= 1) + { + Trace "Deleting '$FileName'\n"; + if (!$DryRun and !unlink $FileName) + { + # The user abandoned the submit procedure half-way through + Error "Could not delete '$FileName': $!\n"; + } + } } } else { - LogMsg "Unable to open '$DataDir/staging': $!"; + Error "Unable to open '$DataDir/staging': $!"; } # Delete obsolete record groups @@ -267,10 +322,14 @@ if ($JobPurgeDays != 0) $RecordGroups->AddFilter("Timestamp", [time() - $JobPurgeDays * 86400], "<"); foreach my $RecordGroup (@{$RecordGroups->GetItems()}) { - my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); - if (defined($ErrMessage)) + if ($DryRun) + { + Trace "Deleting RecordGroup ", $RecordGroup->Id, "\n"; + } + else { - LogMsg $ErrMessage, "\n"; + my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); + Error "$ErrMessage\n" if (defined $ErrMessage); } } } diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 15b2b91b9..8827c227d 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -67,7 +67,7 @@ General setup for the web site: Janitorial tasks: - Run the Janitor.pl script once per day to perform the janitorial tasks. For instance: - 0 0 * * * $HOME/tools/testbot/bin/Janitor.pl + 0 0 * * * $HOME/tools/testbot/bin/Janitor.pl --log-only - Run the CheckWineTestBot.pl script periodically to get notified in case the WineTestBot server dies. For instance: */20 * * * * $HOME/tools/testbot/scripts/CheckWineTestBot.pl -- 2.16.2

1 0

[PATCH 2/2] testbot: Use human readable durations for the administrator notifications.
by Francois Gouget 22 Mar '18

22 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 9 ++++----- testbot/lib/WineTestBot/Log.pm | 9 ++++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index c0288e75a..fa07d2d20 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -265,15 +265,14 @@ sub Monitor() "$VMKey does not exist anymore"; NotifyAdministrator("The $VMKey VM is not relevant anymore", "The $VMKey VM was offline but ceased to be relevant after ". - Elapsed($Start). " seconds:\n\n$Reason\n"); + PrettyElapsed($Start). ":\n\n$Reason\n"); return 1; } if ($VM->Status ne "offline") { NotifyAdministrator("The $VMKey VM is working again (". $VM->Status .")", "The status of the $VMKey VM unexpectedly switched from offline\n". - "to ". $VM->Status ." after ". Elapsed($Start) - ." seconds."); + "to ". $VM->Status ." after ". PrettyElapsed($Start) ."."); return 0; } @@ -320,7 +319,7 @@ sub Monitor() return 1 if (ChangeStatus("offline", "off", "done")); NotifyAdministrator("The $VMKey VM is working again", "The $VMKey VM started working again after ". - Elapsed($Start) ." seconds."); + PrettyElapsed($Start) ." seconds."); return 0; } } @@ -459,6 +458,6 @@ else Error("Unsupported action $Action!\n"); $Rc = 1; } -LogMsg "$Action on $VMKey completed in ", Elapsed($Start), " s\n"; +LogMsg "$Action on $VMKey completed in ", PrettyElapsed($Start), " s\n"; exit $Rc; diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index f1499dd9a..65782c514 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -26,12 +26,13 @@ WineTestBot::Log - Logging =cut use WineTestBot::Config; +use WineTestBot::Utils; use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -@EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed); +@EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed &PrettyElapsed); my $logfile; my $logprefix; @@ -108,4 +109,10 @@ sub Elapsed($) return sprintf("%0.2f", Time()-$Start); } +sub PrettyElapsed($) +{ + my ($Start) = @_; + return DurationToString(Time()-$Start); +} + 1; -- 2.16.2

1 0

[PATCH 1/2] testbot/web: Centralize the conversion of durations to human readable strings.
by Francois Gouget 22 Mar '18

22 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 30 +++++++++++++++++++++++++++++- testbot/web/Activity.pl | 12 ++---------- testbot/web/Stats.pl | 29 ++--------------------------- 3 files changed, 33 insertions(+), 38 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 5538ecd60..63b906242 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -35,7 +35,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString &OpenNewFile &CreateNewFile &CreateNewLink &CreateNewDir - &BuildEMailRecipient); + &DurationToString &BuildEMailRecipient); sub MakeSecureURL($) { @@ -121,6 +121,34 @@ sub CreateNewDir($$) } } +sub DurationToString($;$) +{ + my ($Secs, $Raw) = @_; + + return "n/a" if (!defined $Secs); + + my @Parts; + if (!$Raw) + { + my $Mins = int($Secs / 60); + $Secs -= 60 * $Mins; + my $Hours = int($Mins / 60); + $Mins -= 60 * $Hours; + my $Days = int($Hours / 24); + $Hours -= 24 * $Days; + push @Parts, "${Days}d" if ($Days); + push @Parts, "${Hours}h" if ($Hours); + push @Parts, "${Mins}m" if ($Mins); + } + if (!@Parts or int($Secs) != 0) + { + push @Parts, (@Parts or int($Secs) == $Secs) ? + int($Secs) ."s" : + sprintf('%.1fs', $Secs); + } + return join(" ", @Parts); +} + sub BuildEMailRecipient($$) { my ($EMailAddress, $Name) = @_; diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 9655e1492..08e0291ae 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -28,6 +28,7 @@ use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::Log; +use WineTestBot::Utils; use WineTestBot::VMs; @ActivityPage::ISA = qw(ObjectModel::CGI::FreeFormPage); @@ -72,16 +73,7 @@ sub _GetHtmlTime($) sub _GetHtmlDuration($) { my ($Secs) = @_; - - return "" if ($Secs < 2); - my $Mins = int($Secs / 60); - my $Hours = int($Mins / 60); - - my @Parts; - push @Parts, "${Hours}h" if ($Hours); - push @Parts, "${Mins}m" if ($Mins %= 60); - push @Parts, "${Secs}s" if ($Secs %= 60); - return "<span class='RecordDuration'>". join(" ", @Parts) ."</span>"; + return ($Secs < 2) ? "" : "<span class='RecordDuration'>". DurationToString($Secs) ."</span>"; } sub _CompareVMs() diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 806a3666c..146740789 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -38,31 +38,6 @@ sub _initialize($$$) $self->SUPER::_initialize($Request, $RequiredRole); } -sub _GetDuration($;$) -{ - my ($Secs, $Raw) = @_; - - return "n/a" if (!defined $Secs); - - my @Parts; - if (!$Raw) - { - my $Mins = int($Secs / 60); - my $Hours = int($Mins / 60); - my $Days = int($Hours / 24); - push @Parts, "${Days}d" if ($Days); - my $Part = $Hours - 24 * $Days; - push @Parts, "${Part}h" if ($Part); - $Part = $Mins - 60 * $Hours; - push @Parts, "${Part}m" if ($Part); - $Secs = $Secs - 60 * $Mins; - } - push @Parts, (@Parts or int($Secs) == $Secs) ? - int($Secs) ."s" : - sprintf('%.1fs', $Secs); - return join(" ", @Parts); -} - sub _CompareVMs() { my ($aHost, $bHost) = ($a->GetHost(), $b->GetHost()); @@ -105,7 +80,7 @@ sub _GetStatStr($$;$$) exists $Stats->{"$StatKey.count"}) { my $Avg = _GetAverage($Stats, $StatKey); - return $Avg eq "n/a" ? "n/a" : _GetDuration($Avg, $Flags & $NO_TIME); + return $Avg eq "n/a" ? "n/a" : DurationToString($Avg, $Flags & $NO_TIME); } if ($StatKey =~ /\.size$/ and !($Flags & $NO_AVERAGE) and @@ -124,7 +99,7 @@ sub _GetStatStr($$;$$) } if ($StatKey =~ /(?:\belapsed|\.time(?!\.count))/) { - return _GetDuration($Value, $Flags & $NO_TIME); + return DurationToString($Value, $Flags & $NO_TIME); } if ($StatKey =~ /\.rate$/) { -- 2.16.2

1 0

[PATCH] testbot: Small package documentation tweaks.
by Francois Gouget 22 Mar '18

22 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/RecordGroups.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 14 ++++++++------ testbot/lib/WineTestBot/Users.pm | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index dfa83aeac..426bf60c3 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -21,7 +21,7 @@ package WineTestBot::RecordGroup; =head1 NAME -WineTestBot::RecordGroup - a group of related history records +WineTestBot::RecordGroup - A group of related history records =head1 DESCRIPTION diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 79216d4e1..5f9b2ca98 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -22,12 +22,7 @@ package WineTestBot::StepTask; =head1 NAME -WineTestBot::StepTask - Merged job steps/tasks - -=head1 DESCRIPTION - -This ties together a given WineTestBot::Task object with the corresponding -WineTestBot::Step object. +WineTestBot::StepTask - Merged Step + Task object =cut @@ -93,6 +88,13 @@ package WineTestBot::StepsTasks; WineTestBot::StepsTasks - A collection of StepsTasks objects +=head1 DESCRIPTION + +Provides a flat collection of all the tasks in the specified Job. + +Note that this is an in-memory only collection since it does not correspond to +a specific database table. + =cut use ObjectModel::BasicPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index b9745d804..e9aba5743 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -22,7 +22,7 @@ package WineTestBot::User; =head1 NAME -WineTestBot::Users - A User +WineTestBot::User - A User =cut -- 2.16.2

1 0

Student preparing for GSoC
by Kieran Duggan 22 Mar '18

22 Mar '18

Hello, I am a computer science student at the City College of New York. I have used Linux for a few years now and have frequently relied on Wine to run windows applications, so the opportunity to contribute to Wine is exciting to me. I have successfully built wine from source and ran Ski Free on it to test if it worked. Next I wanted to try and find some of the fixmes that were popping up so I could attempt my first patch, however I am having trouble finding where exactly in the source the fixme's are arising. Maybe It's obvious and I'm just too tired right now to figure it out, but I would be very appreciative if someone could point me in the right direction with this. While I have been learning computer science for years now, I have not yet contributed to an open source project. I am very eager to learn and become familiar with the process. Thank you! Kieran Duggan

4 7

[PATCH] winex11.drv: Fix compile error when Vulkan isn't avaiable
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winex11.drv/vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 27ff722..f96ef64 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -37,10 +37,10 @@ #include "wine/vulkan.h" #include "wine/vulkan_driver.h" -#ifdef SONAME_LIBVULKAN - WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +#ifdef SONAME_LIBVULKAN + typedef VkFlags VkXlibSurfaceCreateFlagsKHR; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 -- 1.9.1

1 0

[PATCH 5/5] usp10: Merge GSUB_initialize_language_cache() and GPOS_expand_language_cache().
by Henri Verbeet 21 Mar '18

21 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/opentype.c | 97 ++++++++++++++++----------------------------- dlls/usp10/usp10_internal.h | 10 ++++- 2 files changed, 42 insertions(+), 65 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 299c301758c..88272656038 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2705,86 +2705,57 @@ static LoadedLanguage *usp10_script_get_language(LoadedScript *script, OPENTYPE_ return NULL; } -static void GSUB_initialize_language_cache(LoadedScript *script) -{ - const OT_Script *table; - DWORD offset; - SIZE_T i; - - if (!(table = script->table[USP10_SCRIPT_TABLE_GSUB])) - return; - - if ((offset = GET_BE_WORD(table->DefaultLangSys))) - { - script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); - script->default_language.gsub_table = (const BYTE *)table + offset; - } - - if (!(script->language_count = GET_BE_WORD(table->LangSysCount))) - return; - - TRACE("Deflang %p, LangCount %lu.\n", script->default_language.gsub_table, script->language_count); - - if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, - script->language_count, sizeof(*script->languages))) - { - ERR("Failed to grow languages array.\n"); - return; - } - - for (i = 0; i < script->language_count; ++i) - { - script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], - table->LangSysRecord[i].LangSysTag[1], - table->LangSysRecord[i].LangSysTag[2], - table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].gsub_table = (const BYTE *)table + GET_BE_WORD(table->LangSysRecord[i].LangSys); - } -} - -static void GPOS_expand_language_cache(LoadedScript *script) +static void usp10_script_add_language_list(LoadedScript *script, + enum usp10_language_table table, const OT_Script *list) { SIZE_T initial_count, count, i; LoadedLanguage *language; - const OT_Script *table; OPENTYPE_TAG tag; DWORD offset; - if (!(table = script->table[USP10_SCRIPT_TABLE_GPOS])) - return; + TRACE("script %p, table %#x, list %p.\n", script, table, list); - if ((offset = GET_BE_WORD(table->DefaultLangSys))) - script->default_language.gpos_table = (const BYTE *)table + offset; + if ((offset = GET_BE_WORD(list->DefaultLangSys))) + { + script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); + script->default_language.table[table] = (const BYTE *)list + offset; + TRACE("Default language %p.\n", script->default_language.table[table]); + } - if (!(count = GET_BE_WORD(table->LangSysCount))) + if (!(count = GET_BE_WORD(list->LangSysCount))) return; - TRACE("Deflang %p, LangCount %lu.\n", script->default_language.gpos_table, count); + TRACE("Adding %lu languages.\n", count); initial_count = script->language_count; for (i = 0; i < count; ++i) { - tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], - table->LangSysRecord[i].LangSysTag[1], - table->LangSysRecord[i].LangSysTag[2], - table->LangSysRecord[i].LangSysTag[3]); + tag = MS_MAKE_TAG(list->LangSysRecord[i].LangSysTag[0], + list->LangSysRecord[i].LangSysTag[1], + list->LangSysRecord[i].LangSysTag[2], + list->LangSysRecord[i].LangSysTag[3]); if (!(initial_count && (language = usp10_script_get_language(script, tag))) && !(language = usp10_script_add_language(script, tag))) return; - language->gpos_table = (const BYTE *)table + GET_BE_WORD(table->LangSysRecord[i].LangSys); + language->table[table] = (const BYTE *)list + GET_BE_WORD(list->LangSysRecord[i].LangSys); } } static void _initialize_language_cache(LoadedScript *script) { - if (!script->languages_initialized) - { - GSUB_initialize_language_cache(script); - GPOS_expand_language_cache(script); - script->languages_initialized = TRUE; - } + const OT_Script *list; + + if (script->languages_initialized) + return; + + if ((list = script->table[USP10_SCRIPT_TABLE_GSUB])) + usp10_script_add_language_list(script, USP10_LANGUAGE_TABLE_GSUB, list); + if ((list = script->table[USP10_SCRIPT_TABLE_GPOS])) + usp10_script_add_language_list(script, USP10_LANGUAGE_TABLE_GPOS, list); + + script->languages_initialized = TRUE; } HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags) @@ -2823,7 +2794,7 @@ HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, } } - if (script->default_language.gsub_table) + if (script->default_language.table[USP10_LANGUAGE_TABLE_GSUB]) { if (i < cMaxTags) pLanguageTags[i] = script->default_language.tag; @@ -2888,13 +2859,13 @@ static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language if (language->features_initialized) return; - if ((lang = language->gsub_table)) + if ((lang = language->table[USP10_LANGUAGE_TABLE_GSUB])) { feature_list = (const OT_FeatureList *)((const BYTE *)gsub_header + GET_BE_WORD(gsub_header->FeatureList)); usp10_language_add_feature_list(language, FEATURE_GSUB_TABLE, lang, feature_list); } - if ((lang = language->gpos_table)) + if ((lang = language->table[USP10_LANGUAGE_TABLE_GPOS])) { feature_list = (const OT_FeatureList *)((const BYTE *)gpos_header + GET_BE_WORD(gpos_header->FeatureList)); usp10_language_add_feature_list(language, FEATURE_GPOS_TABLE, lang, feature_list); @@ -2906,9 +2877,9 @@ static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, char tableType, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) { int i; + LoadedLanguage *language; LoadedScript *script; HRESULT rc = S_OK; - LoadedLanguage *language = NULL; _initialize_script_cache(psc); if (!(script = usp10_script_cache_get_script(psc, script_tag))) @@ -2922,9 +2893,9 @@ HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, O _initialize_language_cache(script); - if ((script->default_language.gsub_table || script->default_language.gpos_table) && script->default_language.tag == language_tag) - language = &script->default_language; - else + language = &script->default_language; + if (language->tag != language_tag || (!language->table[USP10_LANGUAGE_TABLE_GSUB] + && !language->table[USP10_LANGUAGE_TABLE_GPOS])) language = usp10_script_get_language(script, language_tag); if (!language) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 08024c90227..99d7cd11b11 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -152,10 +152,16 @@ typedef struct { WORD *lookups; } LoadedFeature; +enum usp10_language_table +{ + USP10_LANGUAGE_TABLE_GSUB = 0, + USP10_LANGUAGE_TABLE_GPOS, + USP10_LANGUAGE_TABLE_COUNT +}; + typedef struct { OPENTYPE_TAG tag; - const void *gsub_table; - const void *gpos_table; + const void *table[USP10_LANGUAGE_TABLE_COUNT]; BOOL features_initialized; INT feature_count; LoadedFeature *features; -- 2.11.0

2 1

[PATCH 5/5] usp10: Simplify GPOS_expand_language_cache().
by Henri Verbeet 21 Mar '18

21 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/opentype.c | 79 +++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 44 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 49a88a6991d..299c301758c 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2675,6 +2675,23 @@ HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, return rc; } +static LoadedLanguage *usp10_script_add_language(LoadedScript *script, OPENTYPE_TAG tag) +{ + LoadedLanguage *language; + + if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, + script->language_count + 1, sizeof(*script->languages))) + { + ERR("Failed to grow languages array.\n"); + return NULL; + } + + language = &script->languages[script->language_count++]; + language->tag = tag; + + return language; +} + static LoadedLanguage *usp10_script_get_language(LoadedScript *script, OPENTYPE_TAG tag) { size_t i; @@ -2727,62 +2744,36 @@ static void GSUB_initialize_language_cache(LoadedScript *script) static void GPOS_expand_language_cache(LoadedScript *script) { - int count; - const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GPOS]; + SIZE_T initial_count, count, i; LoadedLanguage *language; + const OT_Script *table; + OPENTYPE_TAG tag; DWORD offset; - if (!table) + if (!(table = script->table[USP10_SCRIPT_TABLE_GPOS])) return; - offset = GET_BE_WORD(table->DefaultLangSys); - if (offset) - script->default_language.gpos_table = (const BYTE*)table + offset; - - count = GET_BE_WORD(table->LangSysCount); - - TRACE("Deflang %p, LangCount %i\n",script->default_language.gpos_table, count); + if ((offset = GET_BE_WORD(table->DefaultLangSys))) + script->default_language.gpos_table = (const BYTE *)table + offset; - if (!count) + if (!(count = GET_BE_WORD(table->LangSysCount))) return; - if (!script->language_count) - { - int i; - script->language_count = count; - - script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); + TRACE("Deflang %p, LangCount %lu.\n", script->default_language.gpos_table, count); - for (i = 0; i < script->language_count; i++) - { - int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); - script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].gpos_table = ((const BYTE*)table + offset); - } - } - else if (count) + initial_count = script->language_count; + for (i = 0; i < count; ++i) { - int i; - for (i = 0; i < count; i++) - { - int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); - OPENTYPE_TAG tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); + tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], + table->LangSysRecord[i].LangSysTag[1], + table->LangSysRecord[i].LangSysTag[2], + table->LangSysRecord[i].LangSysTag[3]); - if (!(language = usp10_script_get_language(script, tag))) - { - if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, - script->language_count + 1, sizeof(*script->languages))) - { - ERR("Failed grow languages array.\n"); - return; - } + if (!(initial_count && (language = usp10_script_get_language(script, tag))) + && !(language = usp10_script_add_language(script, tag))) + return; - language = &script->languages[script->language_count]; - ++script->language_count; - language->tag = tag; - } - language->gpos_table = (const BYTE *)table + offset; - } + language->gpos_table = (const BYTE *)table + GET_BE_WORD(table->LangSysRecord[i].LangSys); } } -- 2.11.0

2 1

[PATCH 1/2] user32/tests: Drop broadcast test workaround for Windows NT4
by Alex Henrie 21 Mar '18

21 Mar '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I missed this one the first time around. dlls/user32/tests/broadcast.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 5869119a69..afdb536816 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -138,26 +138,21 @@ if (0) /* TODO: Check the hang flags */ SetLastError( 0xdeadbeef ); recips = BSM_APPLICATIONS; ret = broadcast( BSF_POSTMESSAGE|BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, 0 ); - if (ret) - { - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_OBJECT_0, "Synchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); - ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - } - else /* BSF_SENDNOTIFYMESSAGE not supported on NT4 */ - ok( GetLastError() == ERROR_INVALID_PARAMETER, "failed with err %u\n", GetLastError() ); + ok(ret==1, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_OBJECT_0, "Synchronous message sent instead\n"); + PulseEvent(hevent); + + recips = BSM_APPLICATIONS; + ret = broadcast( BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); + ok(ret==1, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + PulseEvent(hevent); + + recips = BSM_APPLICATIONS; + ret = broadcast( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); + ok(!ret, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + PulseEvent(hevent); recips = BSM_APPLICATIONS; ret = broadcast( 0, &recips, WM_NULL, 100, 0 ); -- 2.16.2

2 3

WineTest cw1 and cw2 Linux update
by Francois Gouget 21 Mar '18

21 Mar '18

On monday I upgraded cw1-hd6800 and cw2-gtx560 to Debian 9.4. That went smoothly (unlike the vm1 and vm2 upgrade) and it does not seem to have upset the WineTest results much. If you look at the March 9 results you can see both the pre and post upgrade WineTest results (I reran the tests before the monday 12 commits). https://test.winehq.org/data/dfde1195385df5ddb11f1104a0e744596b99477f/index… Only d3d9:device seems to have new failures, and only on cw1-hd6800: device.c:1808: Test failed: The cursor handle is 0x10022 However this failure had happened on cw2-gtx560 before the upgrade so it's not entirely new. https://test.winehq.org/data/661791cb7ea3757655aeff4fb061ada27a88cecc/linux… https://test.winehq.org/data/acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0/linux… user32:win also has new failures but those started on the 9th before I upgraded cw1 and cw2. The other differences I saw all seem to be related to random bugs that pop up from time to time. But now is the time to check for yourself. -- Francois Gouget <fgouget(a)codeweavers.com>

1 1

[PATCH] user32: Remove some misleading TODOs
by Nikolay Sivov 21 Mar '18

21 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/button.c | 16 ---------------- dlls/user32/combo.c | 2 -- dlls/user32/edit.c | 5 ----- 3 files changed, 23 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 0f56e4e51d..adfb6a91ff 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -28,30 +28,14 @@ * - WM_SETFOCUS: For (manual or automatic) radio buttons, send the parent window BN_CLICKED * - WM_NCCREATE: Turns any BS_OWNERDRAW button into a BS_PUSHBUTTON button. * - WM_SYSKEYUP - * - BCM_GETIDEALSIZE - * - BCM_GETIMAGELIST - * - BCM_GETTEXTMARGIN - * - BCM_SETIMAGELIST - * - BCM_SETTEXTMARGIN * * Notifications - * - BCN_HOTITEMCHANGE * - BN_DISABLE * - BN_PUSHED/BN_HILITE * + BN_KILLFOCUS: is it OK? * - BN_PAINT * + BN_SETFOCUS: is it OK? * - BN_UNPUSHED/BN_UNHILITE - * - NM_CUSTOMDRAW - * - * Structures/Macros/Definitions - * - BUTTON_IMAGELIST - * - NMBCHOTITEM - * - Button_GetIdealSize - * - Button_GetImageList - * - Button_GetTextMargin - * - Button_SetImageList - * - Button_SetTextMargin */ #include <stdarg.h> diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index ef75c7637e..dcfa661f97 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - ComboBox_[GS]etMinVisible() - * - CB_GETMINVISIBLE, CB_SETMINVISIBLE * - CB_SETTOPINDEX */ diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 693c58f6f8..96ecbece85 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -21,11 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - EDITBALLOONTIP structure - * - EM_GETCUEBANNER/Edit_GetCueBannerText - * - EM_HIDEBALLOONTIP/Edit_HideBalloonTip - * - EM_SETCUEBANNER/Edit_SetCueBannerText - * - EM_SHOWBALLOONTIP/Edit_ShowBalloonTip * - EM_GETIMESTATUS, EM_SETIMESTATUS * - EN_ALIGN_LTR_EC * - EN_ALIGN_RTL_EC -- 2.16.2

1 0

[PATCH 01/10] d3dx9: Introduce a parameter rbtree to speed up get_parameter_by_name().
by Matteo Bruni 21 Mar '18

21 Mar '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 12 ++++ dlls/d3dx9_36/effect.c | 156 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 155 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 5ac5e63aeb6..2044b2af448 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -24,6 +24,8 @@ #define NONAMELESSUNION #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/rbtree.h" #define COBJMACROS #include "d3dx9.h" @@ -278,6 +280,13 @@ struct d3dx_param_eval ULONG64 *version_counter; }; +struct param_rb_entry +{ + struct wine_rb_entry entry; + char *full_name; + struct d3dx_parameter *param; +}; + struct d3dx_shared_data; struct d3dx_top_level_parameter; @@ -300,6 +309,9 @@ struct d3dx_parameter struct d3dx_parameter *members; char *semantic; + + char *full_name; + struct wine_rb_entry rb_entry; }; struct d3dx_top_level_parameter diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 87eaf8684a9..340f3d3fd00 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -20,6 +20,8 @@ #include "config.h" #include "wine/port.h" +#include <stdio.h> + #include "d3dx9_private.h" #include "d3dcompiler.h" @@ -161,6 +163,10 @@ struct d3dx9_base_effect DWORD flags; ULONG64 version_counter; + + struct wine_rb_tree param_tree; + char *full_name_tmp; + unsigned int full_name_tmp_size; }; struct ID3DXEffectImpl @@ -205,8 +211,8 @@ struct ID3DXEffectCompilerImpl struct d3dx9_base_effect base_effect; }; -static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_parameter *parameters, - const char *name); +static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, + unsigned int count, struct d3dx_parameter *parameters, const char *name); static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects); static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child); @@ -682,6 +688,8 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) TRACE("base %p.\n", base); + heap_free(base->full_name_tmp); + if (base->parameters) { for (i = 0; i < base->parameter_count; ++i) @@ -814,7 +822,8 @@ static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX } } -static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_parameter *parameter, const char *name) +static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_effect *base, + struct d3dx_parameter *parameter, const char *name) { UINT element; struct d3dx_parameter *temp_parameter; @@ -835,7 +844,7 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete switch (*part++) { case '.': - return get_parameter_by_name(NULL, temp_parameter, part); + return get_parameter_by_name(base, temp_parameter, part); case '\0': TRACE("Returning parameter %p\n", temp_parameter); @@ -851,8 +860,8 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete return NULL; } -static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_parameter *annotations, - const char *name) +static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, + unsigned int count, struct d3dx_parameter *annotations, const char *name) { UINT i, length; struct d3dx_parameter *temp_parameter; @@ -879,10 +888,10 @@ static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_par switch (*part++) { case '.': - return get_parameter_by_name(NULL, temp_parameter, part); + return get_parameter_by_name(base, temp_parameter, part); case '[': - return get_parameter_element_by_name(temp_parameter, part); + return get_parameter_element_by_name(base, temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part); @@ -898,15 +907,57 @@ static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_par struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, struct d3dx_parameter *parameter, const char *name) { - UINT i, count, length; struct d3dx_parameter *temp_parameter; + unsigned int name_len, param_name_len; + unsigned int i, count, length; + struct wine_rb_entry *entry; + unsigned int full_name_size; const char *part; + char *full_name; TRACE("base %p, parameter %p, name %s\n", base, parameter, debugstr_a(name)); if (!name || !*name) return NULL; + if (!parameter) + { + if ((entry = wine_rb_get(&base->param_tree, name))) + return WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); + return NULL; + } + + /* Pass / technique annotations are not in the parameters tree. */ + if (parameter->full_name) + { + name_len = strlen(name); + param_name_len = strlen(parameter->full_name); + full_name_size = name_len + param_name_len + 2; + if (base->full_name_tmp_size < full_name_size) + { + if (!(full_name = heap_realloc(base->full_name_tmp, full_name_size))) + { + ERR("Out of memory.\n"); + return NULL; + } + base->full_name_tmp = full_name; + base->full_name_tmp_size = full_name_size; + } + else + { + full_name = base->full_name_tmp; + } + memcpy(full_name, parameter->full_name, param_name_len); + full_name[param_name_len] = '.'; + memcpy(full_name + param_name_len + 1, name, name_len); + full_name[param_name_len + 1 + name_len] = 0; + + if ((entry = wine_rb_get(&base->param_tree, full_name))) + return WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); + return NULL; + } + count = parameter ? parameter->member_count : base->parameter_count; + length = strcspn( name, "[.@" ); part = name + length; @@ -925,18 +976,18 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, switch (*part++) { case '.': - return get_parameter_by_name(NULL, temp_parameter, part); + return get_parameter_by_name(base, temp_parameter, part); case '@': { struct d3dx_top_level_parameter *top_param = top_level_parameter_from_parameter(temp_parameter); - return parameter ? NULL : get_annotation_by_name(top_param->annotation_count, + return parameter ? NULL : get_annotation_by_name(base, top_param->annotation_count, top_param->annotations, part); } case '[': - return get_parameter_element_by_name(temp_parameter, part); + return get_parameter_element_by_name(base, temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part); @@ -1460,7 +1511,7 @@ static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_eff annotation_count = get_annotation_from_object(base, object, &annotations); - annotation = get_annotation_by_name(annotation_count, annotations, name); + annotation = get_annotation_by_name(base, annotation_count, annotations, name); if (annotation) { TRACE("Returning parameter %p\n", annotation); @@ -5436,6 +5487,83 @@ static void param_set_magic_number(struct d3dx_parameter *param) memcpy(param->magic_string, parameter_magic_string, sizeof(parameter_magic_string)); } +static int param_rb_compare(const void *key, const struct wine_rb_entry *entry) +{ + const char *name = key; + struct d3dx_parameter *param = WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); + + return strcmp(name, param->full_name); +} + +static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parameter *param, + struct d3dx_parameter *parent, char separator, unsigned int element) +{ + const char *parent_name = parent ? parent->full_name : NULL; + unsigned int i; + + TRACE("Adding parameter %p (%s - parent %p, element %u) to the rbtree.\n", + param, debugstr_a(param->name), parent, element); + + if (parent_name) + { + unsigned int parent_name_len = strlen(parent_name); + unsigned int name_len = strlen(param->name); + unsigned int part_str_len; + unsigned int len; + char part_str[16]; + + if (separator == '[') + { + sprintf(part_str, "[%u]", element); + part_str_len = strlen(part_str); + name_len = 0; + } + else + { + part_str[0] = separator; + part_str[1] = 0; + part_str_len = 1; + } + len = parent_name_len + part_str_len + name_len + 1; + + if (!(param->full_name = heap_alloc(len))) + { + ERR("Out of memory.\n"); + return; + } + + memcpy(param->full_name, parent_name, parent_name_len); + memcpy(param->full_name + parent_name_len, part_str, part_str_len); + memcpy(param->full_name + parent_name_len + part_str_len, param->name, name_len); + param->full_name[len - 1] = 0; + } + else + { + unsigned int len = strlen(param->name) + 1; + + if (!(param->full_name = heap_alloc(len))) + { + ERR("Out of memory.\n"); + return; + } + + memcpy(param->full_name, param->name, len); + } + TRACE("Full name is %s.\n", param->full_name); + wine_rb_put(&base->param_tree, param->full_name, &param->rb_entry); + + if (is_top_level_parameter(param)) + for (i = 0; i < param->top_level_param->annotation_count; ++i) + add_param_to_tree(base, &param->top_level_param->annotations[i], param, '@', 0); + + if (param->element_count) + for (i = 0; i < param->element_count; ++i) + add_param_to_tree(base, &param->members[i], param, '[', i); + else + for (i = 0; i < param->member_count; ++i) + add_param_to_tree(base, &param->members[i], param, '.', 0); +} + static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct d3dx_parameter *param, const char *data, const char **ptr, struct d3dx_parameter *parent, UINT flags) { @@ -6281,6 +6409,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da goto err_out; } + wine_rb_init(&base->param_tree, param_rb_compare); if (base->parameter_count) { base->parameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -6303,6 +6432,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da } walk_parameter_tree(&base->parameters[i].param, param_set_top_level_param, &base->parameters[i]); + add_param_to_tree(base, &base->parameters[i].param, NULL, 0, 0); } } -- 2.13.6

4 12

[PATCH 4/5] wined3d: Merge texture2d_upload_data() and texture3d_upload_data().
by Henri Verbeet 21 Mar '18

21 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 169 ++++++++++++----------------------------- dlls/wined3d/wined3d_private.h | 4 - 2 files changed, 49 insertions(+), 124 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index be40e7135b0..187e2a246b6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1744,19 +1744,10 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3D_OK; } -void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, - const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) -{ - texture->texture_ops->texture_upload_data(texture, sub_resource_idx, context, - format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); -} - /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ -static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, +void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) @@ -1764,10 +1755,11 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int update_w = src_box->right - src_box->left; unsigned int update_h = src_box->bottom - src_box->top; + unsigned int update_d = src_box->back - src_box->front; struct wined3d_bo_address bo; void *converted_mem = NULL; - unsigned int level, layer; struct wined3d_format f; + unsigned int level; GLenum target; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " @@ -1787,8 +1779,17 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int update_h /= format->height_scale.denominator; } + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + level = sub_resource_idx % texture->level_count; + + if (target == GL_TEXTURE_2D_ARRAY) + { + dst_z = sub_resource_idx / texture->level_count; + update_d = 1; + } + bo.buffer_object = data->buffer_object; - bo.addr = (BYTE *)data->addr; + bo.addr = (BYTE *)data->addr + src_box->front * src_slice_pitch; if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) { bo.addr += (src_box->top / format->block_height) * src_row_pitch; @@ -1814,7 +1815,7 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); - if (!(converted_mem = heap_alloc(dst_slice_pitch))) + if (!(converted_mem = heap_calloc(update_d, dst_slice_pitch))) { ERR("Failed to allocate upload buffer.\n"); return; @@ -1823,7 +1824,7 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int src_mem = context_map_bo_address(context, &bo, src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); + dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); context_unmap_bo_address(context, &bo, GL_PIXEL_UNPACK_BUFFER); bo.buffer_object = 0; @@ -1838,10 +1839,6 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int checkGLcall("glBindBuffer"); } - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - level = sub_resource_idx % texture->level_count; - layer = sub_resource_idx / texture->level_count; - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { unsigned int dst_row_pitch, dst_slice_pitch; @@ -1858,17 +1855,17 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); - TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " - "format %#x, image_size %#x, addr %p.\n", - target, level, layer, dst_x, dst_y, - update_w, update_h, internal, dst_slice_pitch, addr); + TRACE("Uploading compressed data, target %#x, level %u, x %u, y %u, z %u, " + "w %u, h %u, d %u, format %#x, image_size %#x, addr %p.\n", + target, level, dst_x, dst_y, dst_z, update_w, update_h, + update_d, internal, dst_slice_pitch, addr); if (dst_row_pitch == src_row_pitch) { - if (target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, - layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, dst_z, + update_w, update_h, update_d, internal, dst_slice_pitch * update_d, addr)); } else { @@ -1878,42 +1875,45 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int } else { - UINT row_count = (update_h + format->block_height - 1) / format->block_height; - UINT row, y; + unsigned int row_count = (update_h + format->block_height - 1) / format->block_height; + unsigned int row, y, z; /* glCompressedTexSubImage2D() ignores pixel store state, so we * can't use the unpack row length like for glTexSubImage2D. */ - for (row = 0, y = dst_y; row < row_count; ++row) + for (z = dst_z; z < dst_z + update_d; ++z) { - if (target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, - layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); - } - else + for (row = 0, y = dst_y; row < row_count; ++row) { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, - update_w, format->block_height, internal, dst_row_pitch, addr)); + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + { + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, z, + update_w, format->block_height, 1, internal, dst_row_pitch, addr)); + } + else + { + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, + update_w, format->block_height, internal, dst_row_pitch, addr)); + } + + y += format->block_height; + addr += src_row_pitch; } - - y += format->block_height; - addr += src_row_pitch; } } checkGLcall("Upload compressed texture data"); } else { - TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " - "format %#x, type %#x, addr %p.\n", - target, level, layer, dst_x, dst_y, - update_w, update_h, format->glFormat, format->glType, bo.addr); + TRACE("Uploading data, target %#x, level %u, x %u, y %u, z %u, " + "w %u, h %u, d %u, format %#x, type %#x, addr %p.\n", + target, level, dst_x, dst_y, dst_z, update_w, update_h, + update_d, format->glFormat, format->glType, bo.addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / format->byte_count); - if (target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) { - GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, - layer, update_w, update_h, 1, format->glFormat, format->glType, bo.addr)); + GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, dst_z, + update_w, update_h, update_d, format->glFormat, format->glType, bo.addr)); } else { @@ -1980,7 +1980,6 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in static const struct wined3d_texture_ops texture2d_ops = { - texture2d_upload_data, texture2d_load_location, }; @@ -2570,75 +2569,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3D_OK; } -/* This call just uploads data, the caller is responsible for binding the - * correct texture. */ -/* Context activation is done by the caller. */ -static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, - const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) -{ - unsigned int level = sub_resource_idx % texture->level_count; - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int dst_row_pitch, dst_slice_pitch; - unsigned int update_w, update_h, update_d; - const BYTE *addr = data->addr; - void *converted_mem = NULL; - - TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " - "row_pitch %#x, slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u, srgb %#x.\n", - texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), - data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); - - addr += src_box->front * slice_pitch; - addr += src_box->top * row_pitch; - addr += src_box->left * format->byte_count; - - update_w = src_box->right - src_box->left; - update_h = src_box->bottom - src_box->top; - update_d = src_box->back - src_box->front; - - if (format->conv_byte_count) - { - if (data->buffer_object) - ERR("Loading a converted texture from a PBO.\n"); - if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) - ERR("Converting a block-based format.\n"); - - dst_row_pitch = update_w * format->conv_byte_count; - dst_slice_pitch = dst_row_pitch * update_h; - - converted_mem = heap_calloc(update_d, dst_slice_pitch); - format->upload(addr, converted_mem, row_pitch, slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - addr = converted_mem; - } - else - { - wined3d_texture_get_pitch(texture, sub_resource_idx, &dst_row_pitch, &dst_slice_pitch); - if (row_pitch != dst_row_pitch || slice_pitch != dst_slice_pitch) - FIXME("Ignoring row/slice pitch (%u/%u).\n", row_pitch, slice_pitch); - } - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, data->buffer_object)); - checkGLcall("glBindBuffer"); - } - - GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, level, dst_x, dst_y, dst_z, - update_w, update_h, update_d, format->glFormat, format->glType, addr)); - checkGLcall("glTexSubImage3D"); - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - } - - heap_free(converted_mem); -} - /* Context activation is done by the caller. */ static void texture3d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_bo_address *data) @@ -2696,7 +2626,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); - texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, &src_box, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); heap_free(data.addr); @@ -2726,7 +2656,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) @@ -2738,7 +2668,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) @@ -2809,7 +2739,6 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in static const struct wined3d_texture_ops texture3d_ops = { - texture3d_upload_data, texture3d_load_location, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 678c669b7c3..fdbcd7c3795 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3083,10 +3083,6 @@ struct gl_texture struct wined3d_texture_ops { - void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, const struct wined3d_format *format, - const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, - unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); }; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Handle upload conversion in texture2d_upload_data().
by Henri Verbeet 21 Mar '18

21 Mar '18

For consistency with texture3d_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 35 ++++--------------- dlls/wined3d/texture.c | 77 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 67 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8f4e1eebba5..2a725e61e1c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1987,9 +1987,9 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re struct wined3d_device *device = texture->resource.device; const struct wined3d_color_key_conversion *conversion; struct wined3d_texture_sub_resource *sub_resource; + const struct wined3d_format *format; struct wined3d_bo_address data; BYTE *src_mem, *dst_mem = NULL; - struct wined3d_format format; struct wined3d_box src_box; BOOL depth; @@ -2080,9 +2080,9 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re wined3d_texture_bind_and_dirtify(texture, context, srgb); wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); - format = *texture->resource.format; + format = texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) - format = *wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); + format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is @@ -2096,35 +2096,12 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re } wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->locations); - if (format.conv_byte_count) - { - /* This code is entered for texture formats which need a fixup. */ - format.byte_count = format.conv_byte_count; - wined3d_format_calculate_pitch(&format, 1, width, height, &dst_row_pitch, &dst_slice_pitch); - - src_mem = context_map_bo_address(context, &data, src_slice_pitch, - GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); - if (!(dst_mem = heap_alloc(dst_slice_pitch))) - { - ERR("Out of memory (%u).\n", dst_slice_pitch); - context_release(context); - return FALSE; - } - format.upload(src_mem, dst_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, width, height, 1); - src_row_pitch = dst_row_pitch; - src_slice_pitch = dst_slice_pitch; - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); - - data.buffer_object = 0; - data.addr = dst_mem; - } - else if (conversion) + if (conversion) { /* This code is only entered for color keying fixups */ struct wined3d_palette *palette = NULL; - wined3d_format_calculate_pitch(&format, device->surface_alignment, + wined3d_format_calculate_pitch(format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch); src_mem = context_map_bo_address(context, &data, src_slice_pitch, @@ -2147,7 +2124,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re data.addr = dst_mem; } - wined3d_texture_upload_data(texture, sub_resource_idx, context, &format, &src_box, + wined3d_texture_upload_data(texture, sub_resource_idx, context, format, &src_box, wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, 0, 0, 0, srgb); heap_free(dst_mem); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f5892430956..be40e7135b0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1745,7 +1745,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { @@ -1757,14 +1757,17 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s * correct texture. */ /* Context activation is done by the caller. */ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int update_w = src_box->right - src_box->left; unsigned int update_h = src_box->bottom - src_box->top; + struct wined3d_bo_address bo; + void *converted_mem = NULL; unsigned int level, layer; + struct wined3d_format f; GLenum target; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " @@ -1784,9 +1787,54 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int update_h /= format->height_scale.denominator; } - if (data->buffer_object) + bo.buffer_object = data->buffer_object; + bo.addr = (BYTE *)data->addr; + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, data->buffer_object)); + bo.addr += (src_box->top / format->block_height) * src_row_pitch; + bo.addr += (src_box->left / format->block_width) * format->block_byte_count; + } + else + { + bo.addr += src_box->top * src_row_pitch; + bo.addr += src_box->left * format->byte_count; + } + + if (format->upload) + { + unsigned int dst_row_pitch, dst_slice_pitch; + void *src_mem; + + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + ERR("Converting a block-based format.\n"); + + f = *format; + f.byte_count = format->conv_byte_count; + format = &f; + + wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); + + if (!(converted_mem = heap_alloc(dst_slice_pitch))) + { + ERR("Failed to allocate upload buffer.\n"); + return; + } + + src_mem = context_map_bo_address(context, &bo, src_slice_pitch, + GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); + context_unmap_bo_address(context, &bo, GL_PIXEL_UNPACK_BUFFER); + + bo.buffer_object = 0; + bo.addr = converted_mem; + src_row_pitch = dst_row_pitch; + src_slice_pitch = dst_slice_pitch; + } + + if (bo.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bo.buffer_object)); checkGLcall("glBindBuffer"); } @@ -1797,12 +1845,9 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { unsigned int dst_row_pitch, dst_slice_pitch; - const BYTE *addr = data->addr; + const BYTE *addr = bo.addr; GLenum internal; - addr += (src_box->top / format->block_height) * src_row_pitch; - addr += (src_box->left / format->block_width) * format->block_byte_count; - if (srgb) internal = format->glGammaInternal; else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET @@ -1859,36 +1904,32 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int } else { - const BYTE *addr = data->addr; - - addr += src_box->top * src_row_pitch; - addr += src_box->left * format->byte_count; - TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, type %#x, addr %p.\n", target, level, layer, dst_x, dst_y, - update_w, update_h, format->glFormat, format->glType, addr); + update_w, update_h, format->glFormat, format->glType, bo.addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / format->byte_count); if (target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, - layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); + layer, update_w, update_h, 1, format->glFormat, format->glType, bo.addr)); } else { gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y, - update_w, update_h, format->glFormat, format->glType, addr); + update_w, update_h, format->glFormat, format->glType, bo.addr); } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); checkGLcall("Upload texture data"); } - if (data->buffer_object) + if (bo.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); checkGLcall("glBindBuffer"); } + heap_free(converted_mem); if (wined3d_settings.strict_draw_ordering) gl_info->gl_ops.gl.p_glFlush(); @@ -2533,7 +2574,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc * correct texture. */ /* Context activation is done by the caller. */ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb2938b6aca..678c669b7c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3084,7 +3084,7 @@ struct gl_texture struct wined3d_texture_ops { void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, + struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -3294,7 +3294,7 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, HWND window, RECT *rect) DECLSPEC_HIDDEN; void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, -- 2.11.0

1 0

[PATCH 2/5] wined3d: Don't bother removing PBOs for formats with upload/download conversion in texture2d_load_texture().
by Henri Verbeet 21 Mar '18

21 Mar '18

We don't use PBOs for those in the first place. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3760abbff94..8f4e1eebba5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2087,7 +2087,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is * getting called. */ - if ((format.conv_byte_count || conversion) && texture->sub_resources[sub_resource_idx].buffer_object) + if (conversion && sub_resource->buffer_object) { TRACE("Removing the pbo attached to texture %p, %u.\n", texture, sub_resource_idx); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Always pass a valid source box to texture3d_upload_data().
by Henri Verbeet 21 Mar '18

21 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 35 +++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 9 +++++++++ 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e8f5af33635..f5892430956 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2549,22 +2549,13 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); - if (src_box) - { - addr += src_box->front * slice_pitch; - addr += src_box->top * row_pitch; - addr += src_box->left * format->byte_count; + addr += src_box->front * slice_pitch; + addr += src_box->top * row_pitch; + addr += src_box->left * format->byte_count; - update_w = src_box->right - src_box->left; - update_h = src_box->bottom - src_box->top; - update_d = src_box->back - src_box->front; - } - else - { - update_w = wined3d_texture_get_level_width(texture, level); - update_h = wined3d_texture_get_level_height(texture, level); - update_d = wined3d_texture_get_level_depth(texture, level); - } + update_w = src_box->right - src_box->left; + update_h = src_box->bottom - src_box->top; + update_d = src_box->back - src_box->front; if (format->conv_byte_count) { @@ -2646,6 +2637,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; unsigned int row_pitch, slice_pitch; struct wined3d_bo_address data; + struct wined3d_box src_box; /* Optimisations are possible, but the effort should be put into either * implementing EXT_SRGB_DECODE in the driver or finding out why we @@ -2659,11 +2651,12 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in return; wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); + wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, - NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); + &src_box, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); heap_free(data.addr); } @@ -2685,21 +2678,27 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in if (sub_resource->locations & WINED3D_LOCATION_SYSMEM) { struct wined3d_const_bo_address data = {0, texture->resource.heap_memory}; + struct wined3d_box src_box; + data.addr += sub_resource->offset; wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); + wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, - NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); + &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; + struct wined3d_box src_box; + wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); + wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, - NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); + &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 311e292d998..cb2938b6aca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3241,6 +3241,15 @@ static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wi return max(1, texture->pow2_height >> level); } +static inline void wined3d_texture_get_level_box(const struct wined3d_texture *texture, + unsigned int level, struct wined3d_box *box) +{ + wined3d_box_set(box, 0, 0, + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level), + 0, wined3d_texture_get_level_depth(texture, level)); +} + HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, -- 2.11.0

1 0

[v3 PATCH 5/5] bcrypt: Allow to call BCryptSetProperty on key objects.
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 89 ++++++++++++++++++++++++++++++++-------------- dlls/bcrypt/tests/bcrypt.c | 4 +++ 2 files changed, 67 insertions(+), 26 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index a08eb00269..cd44bdf59c 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -679,32 +679,6 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu } } -NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -{ - struct object *object = handle; - - TRACE( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); - - if (!object) return STATUS_INVALID_HANDLE; - - switch (object->magic) - { - case MAGIC_ALG: - { - struct algorithm *alg = (struct algorithm *)object; - return set_alg_property( alg, prop, value, size, flags ); - } - case MAGIC_KEY: - { - FIXME( "keys not implemented yet\n" ); - return STATUS_NOT_IMPLEMENTED; - } - default: - WARN( "unknown magic %08x\n", object->magic ); - return STATUS_INVALID_HANDLE; - } -} - NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen, UCHAR *secret, ULONG secretlen, ULONG flags ) { @@ -954,6 +928,31 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_SUCCESS; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + { + key->mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) + { + key->mode = MODE_ID_GCM; + return STATUS_SUCCESS; + } + else + { + FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + return STATUS_NOT_IMPLEMENTED; + } + } + + FIXME( "unsupported key property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { switch (key->alg_id) @@ -1089,6 +1088,12 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_SUCCESS; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { CCCryptorStatus status; @@ -1171,6 +1176,12 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { ERR( "support for keys not available at build time\n" ); @@ -1478,6 +1489,32 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return status; } +NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + struct object *object = handle; + + TRACE( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); + + if (!object) return STATUS_INVALID_HANDLE; + + switch (object->magic) + { + case MAGIC_ALG: + { + struct algorithm *alg = (struct algorithm *)object; + return set_alg_property( alg, prop, value, size, flags ); + } + case MAGIC_KEY: + { + struct key *key = (struct key *)object; + return set_key_property( key, prop, value, size, flags ); + } + default: + WARN( "unknown magic %08x\n", object->magic ); + return STATUS_INVALID_HANDLE; + } +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1176796dbc..9922e4114f 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -525,6 +525,10 @@ static void test_BCryptGenerateSymmetricKey(void) sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = pBCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, + sizeof(BCRYPT_CHAIN_MODE_CBC), 0); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret); + size = 0xdeadbeef; ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 2.16.2

2 1

[v3 PATCH 4/5] include: Add ecdsa and asymmetric key related bcrypt definitions.
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/bcrypt.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index d0b29c7cdd..717d77c731 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -61,6 +61,8 @@ typedef LONG NTSTATUS; #define BCRYPT_OPAQUE_KEY_BLOB (const WCHAR []){'O','p','a','q','u','e','K','e','y','B','l','o','b',0} #define BCRYPT_KEY_DATA_BLOB (const WCHAR []){'K','e','y','D','a','t','a','B','l','o','b',0} #define BCRYPT_AES_WRAP_KEY_BLOB (const WCHAR []){'R','f','c','3','5','6','5','K','e','y','W','r','a','p','B','l','o','b',0} +#define BCRYPT_ECCPUBLIC_BLOB (const WCHAR []){'E','C','C','P','U','B','L','I','C','B','L','O','B',0} +#define BCRYPT_ECCPRIVATE_BLOB (const WCHAR []){'E','C','C','P','R','I','V','A','T','E','B','L','O','B',0} #define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} @@ -76,6 +78,9 @@ typedef LONG NTSTATUS; #define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} #define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} #define BCRYPT_SHA512_ALGORITHM (const WCHAR []){'S','H','A','5','1','2',0} +#define BCRYPT_ECDSA_P256_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','2','5','6',0} +#define BCRYPT_ECDSA_P384_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','3','8','4',0} +#define BCRYPT_ECDSA_P521_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','5','2','1',0} #define BCRYPT_CHAIN_MODE_NA (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','N','/','A',0} #define BCRYPT_CHAIN_MODE_CBC (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','B','C',0} @@ -84,6 +89,13 @@ typedef LONG NTSTATUS; #define BCRYPT_CHAIN_MODE_CCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','C','M',0} #define BCRYPT_CHAIN_MODE_GCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0} +#define BCRYPT_ECDSA_PUBLIC_P256_MAGIC 0x31534345 +#define BCRYPT_ECDSA_PRIVATE_P256_MAGIC 0x32534345 +#define BCRYPT_ECDSA_PUBLIC_P384_MAGIC 0x33534345 +#define BCRYPT_ECDSA_PRIVATE_P384_MAGIC 0x34534345 +#define BCRYPT_ECDSA_PUBLIC_P521_MAGIC 0x35534345 +#define BCRYPT_ECDSA_PRIVATE_P521_MAGIC 0x36534345 + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName; @@ -115,6 +127,23 @@ typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO ULONG dwFlags; } BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO, *PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO; +typedef struct _BCRYPT_ECCKEY_BLOB +{ + ULONG dwMagic; + ULONG cbKey; +} BCRYPT_ECCKEY_BLOB, *PBCRYPT_ECCKEY_BLOB; + +typedef struct _BCRYPT_PKCS1_PADDING_INFO +{ + LPCWSTR pszAlgId; +} BCRYPT_PKCS1_PADDING_INFO; + +#define BCRYPT_PAD_NONE 0x00000001 +#define BCRYPT_PAD_PKCS1 0x00000002 +#define BCRYPT_PAD_OAEP 0x00000004 +#define BCRYPT_PAD_PSS 0x00000008 +#define BCRYPT_PAD_PKCS1_OPTIONAL_HASH_OID 0x00000010 + #define BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_VERSION 1 #define BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG 0x00000001 -- 2.16.2

2 1

[v3 PATCH 3/5] bcrypt: Add support for computing/comparing cipher tag.
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 10 +++++----- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 573cd374a4..a08eb00269 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -50,6 +50,9 @@ static HINSTANCE instance; #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); +/* Not present in gnutls version < 3.0 */ +static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_cipher_decrypt2); @@ -69,6 +72,11 @@ MAKE_FUNCPTR(gnutls_perror); #define GNUTLS_CIPHER_AES_256_GCM 94 #endif +static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void * tag, size_t tag_size) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -102,6 +110,12 @@ static BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_perror) #undef LOAD_FUNCPTR + if (!(pgnutls_cipher_tag = wine_dlsym( libgnutls_handle, "gnutls_cipher_tag", NULL, 0 ))) + { + WARN("gnutls_cipher_tag not found\n"); + pgnutls_cipher_tag = compat_gnutls_cipher_tag; + } + if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) { pgnutls_perror( ret ); @@ -1018,6 +1032,19 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + int ret; + + if ((ret = pgnutls_cipher_tag( key->handle, tag, len ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->handle) pgnutls_cipher_deinit( key->handle ); @@ -1123,6 +1150,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); @@ -1158,6 +1191,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { ERR( "support for keys not available at build time\n" ); @@ -1311,7 +1350,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if ((status = key_encrypt( key, input, input_len, output, output_len ))) return status; - return STATUS_SUCCESS; + return key_get_tag( key, auth_info->pbTag, auth_info->cbTag ); } if ((status = key_set_params( key, iv, iv_len ))) return status; @@ -1370,6 +1409,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (key->mode == MODE_ID_GCM) { BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + UCHAR tag[16]; if (!auth_info) return STATUS_INVALID_PARAMETER; if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; @@ -1387,6 +1427,11 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if ((status = key_decrypt( key, input, input_len, output, output_len ))) return status; + if ((status = key_get_tag( key, tag, sizeof(tag) ))) + return status; + if (memcmp( tag, auth_info->pbTag, auth_info->cbTag )) + return STATUS_AUTH_TAG_MISMATCH; + return STATUS_SUCCESS; } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e3cbc87db4..1176796dbc 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -754,11 +754,11 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == 32, "got %u\n", size); ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); - todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); + ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); + ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); /* input size is not multiple of block size */ size = 0; @@ -769,11 +769,11 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == 24, "got %u\n", size); ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); - todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); + ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 24; i++) ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); + ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); @@ -977,7 +977,7 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); + ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); ok(size == 32, "got %u\n", size); ret = pBCryptDestroyKey(key); -- 2.16.2

2 1

[v3 PATCH 2/5] bcrypt: Implement BCryptDecrypt for AES GCM mode.
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 28 +++++++++++++++++++++++----- dlls/bcrypt/tests/bcrypt.c | 8 ++++---- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 96695532b5..573cd374a4 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1361,17 +1361,35 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (padding) - { - FIXME( "padding info not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not supported\n", flags ); return STATUS_NOT_IMPLEMENTED; } + if (key->mode == MODE_ID_GCM) + { + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + + if (!auth_info) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; + if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; + + if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + return status; + + *ret_len = input_len; + if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; + if (!output) return STATUS_SUCCESS; + if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + + if ((status = key_decrypt( key, input, input_len, output, output_len ))) + return status; + + return STATUS_SUCCESS; + } + if ((status = key_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1875fb3f89..e3cbc87db4 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -969,16 +969,16 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(plaintext, 0, sizeof(plaintext)); ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); - todo_wine ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); /* test with wrong tag */ memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); + ok(size == 32, "got %u\n", size); ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 2.16.2

2 1

[v3 PATCH 1/5] bcrypt: Implement BCryptEncrypt for AES GCM mode.
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 59 +++++++++++++++++++++++++++++++++++++++------- dlls/bcrypt/tests/bcrypt.c | 18 +++++++------- 2 files changed, 60 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fa80318f28..96695532b5 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -63,6 +63,12 @@ MAKE_FUNCPTR(gnutls_global_set_log_level); MAKE_FUNCPTR(gnutls_perror); #undef MAKE_FUNCPTR +#if GNUTLS_VERSION_MAJOR < 3 +#define GNUTLS_CIPHER_AES_192_CBC 92 +#define GNUTLS_CIPHER_AES_128_GCM 93 +#define GNUTLS_CIPHER_AES_256_GCM 94 +#endif + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -848,6 +854,7 @@ struct key { struct object hdr; enum alg_id alg_id; + enum mode_id mode; ULONG block_size; gnutls_cipher_hd_t handle; UCHAR *secret; @@ -858,6 +865,7 @@ struct key { struct object hdr; enum alg_id alg_id; + enum mode_id mode; ULONG block_size; CCCryptorRef ref_encrypt; CCCryptorRef ref_decrypt; @@ -868,6 +876,7 @@ struct key struct key { struct object hdr; + enum mode_id mode; ULONG block_size; }; #endif @@ -923,6 +932,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s memcpy( buffer, secret, secret_len ); key->alg_id = alg->id; + key->mode = alg->mode; key->handle = 0; /* initialized on first use */ key->secret = buffer; key->secret_len = secret_len; @@ -935,9 +945,13 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) switch (key->alg_id) { case ALG_ID_AES: - FIXME( "handle block size and chaining mode\n" ); - return GNUTLS_CIPHER_AES_128_CBC; - + WARN( "handle block size\n" ); + switch (key->mode) + { + case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_CBC: + default: return GNUTLS_CIPHER_AES_128_CBC; + } default: FIXME( "algorithm %u not supported\n", key->alg_id ); return GNUTLS_CIPHER_UNKNOWN; @@ -1019,6 +1033,14 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s switch (alg->id) { case ALG_ID_AES: + switch (alg->mode) + { + case MODE_ID_CBC: + break; + default: + FIXME( "mode %u not supported\n", alg->mode ); + return STATUS_NOT_SUPPORTED; + } break; default: @@ -1031,6 +1053,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s memcpy( buffer, secret, secret_len ); key->alg_id = alg->id; + key->mode = alg->mode; key->ref_encrypt = NULL; /* initialized on first use */ key->ref_decrypt = NULL; key->secret = buffer; @@ -1260,17 +1283,37 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (padding) - { - FIXME( "padding info not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not implemented\n", flags ); return STATUS_NOT_IMPLEMENTED; } + if (key->mode == MODE_ID_GCM) + { + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + + if (!auth_info) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; + if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; + if (auth_info->dwFlags & BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG) + FIXME( "call chaining not implemented\n" ); + + if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + return status; + + *ret_len = input_len; + if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; + if (!output) return STATUS_SUCCESS; + if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + + if ((status = key_encrypt( key, input, input_len, output, output_len ))) + return status; + + return STATUS_SUCCESS; + } + if ((status = key_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index ba2011f5df..1875fb3f89 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -751,12 +751,12 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); - todo_wine ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) - todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); @@ -766,12 +766,12 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = pBCryptEncrypt(key, data2, 24, &auth_info, ivbuf, 16, ciphertext, 24, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 24, "got %u\n", size); - todo_wine ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 24, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 24; i++) - todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); @@ -784,7 +784,7 @@ static void test_BCryptEncrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); - todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 2.16.2

2 1

[PATCH] winex11: Print ERR() message when Wine was built without Vulkan support.
by Józef Kucia 21 Mar '18

21 Mar '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/vulkan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 058609625452..27ff72212da7 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -533,6 +533,7 @@ const struct vulkan_funcs *get_vulkan_driver(UINT version) const struct vulkan_funcs *get_vulkan_driver(UINT version) { + ERR("Wine was built without Vulkan support.\n"); return NULL; } -- 2.16.1

1 0

[PATCH v5] iphlpapi: Add support for ConvertLengthToIpv4Mask()
by Dagfinn Reiakvam 21 Mar '18

21 Mar '18

This patch fixes bug: https://bugs.winehq.org/show_bug.cgi?id=44742 Signed-off-by: Dagfinn Reiakvam <dagfinn(a)reiakvam.no> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 19 +++++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 36 ++++++++++++++++++++++++++++++++++++ include/netioapi.h | 1 + 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index b6c9aef..bbd1ed8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -23,7 +23,7 @@ @ stdcall ConvertInterfaceNameToLuidW( wstr ptr ) #@ stub ConvertInterfacePhysicalAddressToLuid #@ stub ConvertIpv4MaskToLength -#@ stub ConvertLengthToIpv4Mask +@ stdcall ConvertLengthToIpv4Mask( long ptr ) #@ stub ConvertRemoteInterfaceAliasToLuid #@ stub ConvertRemoteInterfaceGuidToLuid #@ stub ConvertRemoteInterfaceIndexToLuid diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 97284ed..604470a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,6 +3223,25 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) } /****************************************************************** + * ConvertLengthToIpv4Mask (IPHLPAPI.@) + */ +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG mask_len, ULONG *mask) +{ + if (mask_len > 32) + { + *mask = INADDR_NONE; + return ERROR_INVALID_PARAMETER; + } + + if (mask_len == 0) + *mask = 0; + else + *mask = htonl(~0u << (32 - mask_len)); + + return NO_ERROR; +} + +/****************************************************************** * if_nametoindex (IPHLPAPI.@) */ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 873612d..3509005 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -96,6 +96,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameW)(const NET_LUID*,WCHAR*,SIZE_ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T); static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*); static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); @@ -149,6 +150,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask"); pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } @@ -2174,6 +2176,39 @@ static void test_GetUnicastIpAddressTable(void) pFreeMibTable(table); } +static void test_ConvertLengthToIpv4Mask(void) +{ + DWORD ret; + DWORD n; + ULONG mask; + ULONG expected; + + if (!pConvertLengthToIpv4Mask) + { + win_skip( "ConvertLengthToIpv4Mask not available\n" ); + return; + } + + for (n = 0; n <= 32; n++) + { + mask = 0xdeadbeef; + if (n > 0) + expected = htonl( ~0u << (32 - n) ); + else + expected = 0; + + ret = pConvertLengthToIpv4Mask( n, &mask ); + ok( ret == NO_ERROR, "ConvertLengthToIpv4Mask returned 0x%08x, expected 0x%08x\n", ret, NO_ERROR ); + ok( mask == expected, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, expected ); + } + + /* Testing for out of range. In this case both mask and return are changed to indicate error. */ + mask = 0xdeadbeef; + ret = pConvertLengthToIpv4Mask( 33, &mask ); + ok( ret == ERROR_INVALID_PARAMETER, "ConvertLengthToIpv4Mask returned 0x%08x, expected 0x%08x\n", ret, ERROR_INVALID_PARAMETER ); + ok( mask == INADDR_NONE, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, INADDR_NONE ); +} + START_TEST(iphlpapi) { @@ -2201,6 +2236,7 @@ START_TEST(iphlpapi) test_GetIfTable2Ex(); test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); + test_ConvertLengthToIpv4Mask(); freeIPHlpApi(); } } diff --git a/include/netioapi.h b/include/netioapi.h index 1095888..4bd64e8 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -170,6 +170,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID*,char*,SIZE_T); DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID*,WCHAR*,SIZE_T); DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); -- 2.7.4

2 1

[PATCH 1/6] shell32: Use array for icon lists
by Nikolay Sivov 21 Mar '18

21 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- These are fixes for https://bugs.winehq.org/show_bug.cgi?id=24721. dlls/shell32/iconcache.c | 114 +++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 8b864df5e8..562f9b243c 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -61,8 +61,7 @@ typedef struct static HDPA sic_hdpa; static INIT_ONCE sic_init_once = INIT_ONCE_STATIC_INIT; -static HIMAGELIST ShellSmallIconList; -static HIMAGELIST ShellBigIconList; +static HIMAGELIST shell_imagelists[SHIL_SMALL+1]; static CRITICAL_SECTION SHELL32_SicCS; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -158,8 +157,9 @@ static int SIC_LoadOverlayIcon(int icon_idx); * Creates a new icon as a copy of the passed-in icon, overlaid with a * shortcut image. */ -static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large) -{ ICONINFO SourceIconInfo, ShortcutIconInfo, TargetIconInfo; +static HICON SIC_OverlayShortcutImage(HICON SourceIcon, int type) +{ + ICONINFO SourceIconInfo, ShortcutIconInfo, TargetIconInfo; HICON ShortcutIcon, TargetIcon; BITMAP SourceBitmapInfo, ShortcutBitmapInfo; HDC SourceDC = NULL, @@ -186,21 +186,16 @@ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large) resource id, but not all icons are present yet so we can't use icon indices */ - if (s_imgListIdx != -1) - { - if (large) - ShortcutIcon = ImageList_GetIcon(ShellBigIconList, s_imgListIdx, ILD_TRANSPARENT); - else - ShortcutIcon = ImageList_GetIcon(ShellSmallIconList, s_imgListIdx, ILD_TRANSPARENT); - } else - ShortcutIcon = NULL; - - if (NULL == ShortcutIcon - || ! GetIconInfo(ShortcutIcon, &ShortcutIconInfo) - || 0 == GetObjectW(ShortcutIconInfo.hbmColor, sizeof(BITMAP), &ShortcutBitmapInfo)) - { - return NULL; - } + if (s_imgListIdx != -1) + ShortcutIcon = ImageList_GetIcon(shell_imagelists[type], s_imgListIdx, ILD_TRANSPARENT); + else + ShortcutIcon = NULL; + + if (NULL == ShortcutIcon || ! GetIconInfo(ShortcutIcon, &ShortcutIconInfo) + || 0 == GetObjectW(ShortcutIconInfo.hbmColor, sizeof(BITMAP), &ShortcutBitmapInfo)) + { + return NULL; + } TargetIconInfo = SourceIconInfo; TargetIconInfo.hbmMask = NULL; @@ -308,7 +303,8 @@ fail: * appends an icon pair to the end of the cache */ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallIcon, HICON hBigIcon, DWORD dwFlags) -{ LPSIC_ENTRY lpsice; +{ + LPSIC_ENTRY lpsice; INT ret, index, index1; WCHAR path[MAX_PATH]; TRACE("%s %i %p %p\n", debugstr_w(sSourceFile), dwSourceIndex, hSmallIcon ,hBigIcon); @@ -333,8 +329,8 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallI } else { - index = ImageList_AddIcon (ShellSmallIconList, hSmallIcon); - index1= ImageList_AddIcon (ShellBigIconList, hBigIcon); + index = ImageList_AddIcon(shell_imagelists[SHIL_SMALL], hSmallIcon); + index1 = ImageList_AddIcon(shell_imagelists[SHIL_LARGE], hBigIcon); if (index!=index1) { @@ -350,12 +346,9 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallI static BOOL get_imagelist_icon_size(int list, SIZE *size) { - HIMAGELIST image_list; - if (list < SHIL_LARGE || list > SHIL_SMALL) return FALSE; - image_list = (list == SHIL_LARGE) ? ShellBigIconList : ShellSmallIconList; - return ImageList_GetIconSize( image_list, &size->cx, &size->cy ); + return ImageList_GetIconSize( shell_imagelists[list], &size->cx, &size->cy ); } /**************************************************************************** @@ -364,7 +357,7 @@ static BOOL get_imagelist_icon_size(int list, SIZE *size) * NOTES * gets small/big icon by number from a file */ -static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) +static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD flags) { HICON hiconLarge=0; HICON hiconSmall=0; @@ -384,10 +377,11 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) return -1; } - if (0 != (dwFlags & GIL_FORSHORTCUT)) - { - hiconLargeShortcut = SIC_OverlayShortcutImage(hiconLarge, TRUE); - hiconSmallShortcut = SIC_OverlayShortcutImage(hiconSmall, FALSE); + if (flags & GIL_FORSHORTCUT) + { + hiconLargeShortcut = SIC_OverlayShortcutImage(hiconLarge, SHIL_LARGE); + hiconSmallShortcut = SIC_OverlayShortcutImage(hiconSmall, SHIL_SMALL); + if (NULL != hiconLargeShortcut && NULL != hiconSmallShortcut) { DestroyIcon( hiconLarge ); @@ -400,14 +394,14 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) WARN("Failed to create shortcut overlaid icons\n"); if (NULL != hiconLargeShortcut) DestroyIcon(hiconLargeShortcut); if (NULL != hiconSmallShortcut) DestroyIcon(hiconSmallShortcut); - dwFlags &= ~ GIL_FORSHORTCUT; + flags &= ~ GIL_FORSHORTCUT; } - } + } - ret = SIC_IconAppend( sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, dwFlags ); - DestroyIcon( hiconLarge ); - DestroyIcon( hiconSmall ); - return ret; + ret = SIC_IconAppend( sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, flags ); + DestroyIcon( hiconLarge ); + DestroyIcon( hiconSmall ); + return ret; } static int get_shell_icon_size(void) @@ -436,6 +430,7 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context HICON hSm, hLg; int cx_small, cy_small; int cx_large, cy_large; + unsigned int i; if (!IsProcessDPIAware()) { @@ -460,11 +455,11 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context return(FALSE); } - ShellSmallIconList = ImageList_Create(cx_small,cy_small,ILC_COLOR32|ILC_MASK,0,0x20); - ShellBigIconList = ImageList_Create(cx_large,cy_large,ILC_COLOR32|ILC_MASK,0,0x20); + shell_imagelists[SHIL_SMALL] = ImageList_Create(cx_small, cy_small, ILC_COLOR32 | ILC_MASK, 0, 0x20); + shell_imagelists[SHIL_LARGE] = ImageList_Create(cx_large, cy_large, ILC_COLOR32 | ILC_MASK, 0, 0x20); - ImageList_SetBkColor(ShellSmallIconList, CLR_NONE); - ImageList_SetBkColor(ShellBigIconList, CLR_NONE); + for (i = 0; i < ARRAY_SIZE(shell_imagelists); i++) + ImageList_SetBkColor(shell_imagelists[i], CLR_NONE); /* Load the document icon, which is used as the default if an icon isn't found. */ hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), @@ -480,10 +475,10 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context SIC_IconAppend (swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); SIC_IconAppend (swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); - - TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList); - return TRUE; + TRACE("small list=%p, large list=%p\n", shell_imagelists[SHIL_SMALL], shell_imagelists[SHIL_LARGE]); + + return TRUE; } /************************************************************************* * SIC_Destroy @@ -499,19 +494,22 @@ static INT CALLBACK sic_free( LPVOID ptr, LPVOID lparam ) void SIC_Destroy(void) { - TRACE("\n"); + unsigned int i; - EnterCriticalSection(&SHELL32_SicCS); + TRACE("\n"); - if (sic_hdpa) DPA_DestroyCallback(sic_hdpa, sic_free, NULL ); + EnterCriticalSection(&SHELL32_SicCS); - if (ShellSmallIconList) - ImageList_Destroy(ShellSmallIconList); - if (ShellBigIconList) - ImageList_Destroy(ShellBigIconList); + if (sic_hdpa) DPA_DestroyCallback(sic_hdpa, sic_free, NULL ); - LeaveCriticalSection(&SHELL32_SicCS); - DeleteCriticalSection(&SHELL32_SicCS); + for (i = 0; i < ARRAY_SIZE(shell_imagelists); i++) + { + if (shell_imagelists[i]) + ImageList_Destroy(shell_imagelists[i]); + } + + LeaveCriticalSection(&SHELL32_SicCS); + DeleteCriticalSection(&SHELL32_SicCS); } /***************************************************************************** @@ -621,14 +619,16 @@ static int SIC_LoadOverlayIcon(int icon_idx) * imglist[1|2] [OUT] pointer which receives imagelist handles * */ -BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) +BOOL WINAPI Shell_GetImageLists(HIMAGELIST *large_list, HIMAGELIST *small_list) { - TRACE("(%p,%p)\n",lpBigList,lpSmallList); + TRACE("(%p, %p)\n", large_list, small_list); + InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); - if (lpBigList) *lpBigList = ShellBigIconList; - if (lpSmallList) *lpSmallList = ShellSmallIconList; + if (large_list) *large_list = shell_imagelists[SHIL_LARGE]; + if (small_list) *small_list = shell_imagelists[SHIL_SMALL]; return TRUE; } + /************************************************************************* * PidlToSicIndex [INTERNAL] * -- 2.16.2

1 5

[PATCH 1/3] comdlg32: Use flat navigation toolbar
by Nikolay Sivov 21 Mar '18

21 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comdlg32/filedlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index a882f80417..81f7449d46 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1443,13 +1443,13 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) if (fodInfos->unicode) fodInfos->DlgInfos.hwndTB = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, - WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE, + WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT | CCS_NODIVIDER | CCS_NORESIZE, rectTB.left, rectTB.top, rectTB.right - rectTB.left, rectTB.bottom - rectTB.top, hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL); else fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, - WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE, + WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT | CCS_NODIVIDER | CCS_NORESIZE, rectTB.left, rectTB.top, rectTB.right - rectTB.left, rectTB.bottom - rectTB.top, hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL); -- 2.16.2

1 2

[PATCH 5/5] ntoskrnl.exe: Add ObGetFilterVersion stub
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index aba16efca5..6ef3d3121d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2327,6 +2327,16 @@ void WINAPI ObUnRegisterCallbacks(void *handle) FIXME( "stub: %p\n", handle ); } +/*********************************************************************** + * ObGetFilterVersion (NTOSKRNL.EXE.@) + */ +USHORT WINAPI ObGetFilterVersion(void) +{ + FIXME( "stub:\n" ); + + return OB_FLT_REGISTRATION_VERSION; +} + /*********************************************************************** * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 9f73aac60a..2d3d6f19c3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -805,6 +805,7 @@ @ stdcall ObDereferenceObject(ptr) @ stub ObDereferenceSecurityDescriptor @ stub ObFindHandleForObject +@ stdcall ObGetFilterVersion() @ stub ObGetObjectSecurity @ stub ObInsertObject @ stub ObLogSecurityDescriptor diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 438a97eb79..4fcc20dfeb 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1432,6 +1432,7 @@ static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) } void WINAPI ObDereferenceObject(void*); +USHORT WINAPI ObGetFilterVersion(void); NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION*, void**); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); -- 2.16.2

1 0

[PATCH 4/5] ntoskrnl.exe: Add ObUnRegisterCallbacks stub
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 63886583ec..aba16efca5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2319,6 +2319,14 @@ NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION *callBack, void ** return STATUS_SUCCESS; } +/*********************************************************************** + * ObUnRegisterCallbacks (NTOSKRNL.EXE.@) + */ +void WINAPI ObUnRegisterCallbacks(void *handle) +{ + FIXME( "stub: %p\n", handle ); +} + /*********************************************************************** * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8c3057f06e..9f73aac60a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -822,6 +822,7 @@ @ stub ObSetHandleAttributes @ stub ObSetSecurityDescriptorInfo @ stub ObSetSecurityObjectByPointer +@ stdcall ObUnRegisterCallbacks(ptr) @ stub PfxFindPrefix @ stub PfxInitialize @ stub PfxInsertPrefix diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index ba0030f4bd..438a97eb79 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1436,6 +1436,7 @@ NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION*, void**); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE); +void WINAPI ObUnRegisterCallbacks(void*); POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID); -- 2.16.2

1 0

[PATCH 3/5] ntoskrnl.exe: Add ObRegisterCallbacks stub
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index deca120cb7..63886583ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2306,6 +2306,18 @@ void WINAPI ObfDereferenceObject( void *obj ) ObDereferenceObject( obj ); } +/*********************************************************************** + * ObRegisterCallbacks (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION *callBack, void **handle) +{ + FIXME( "stub: %p %p\n", callBack, handle ); + + if(handle) + *handle = UlongToHandle(0xdeadbeaf); + + return STATUS_SUCCESS; +} /*********************************************************************** * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2f54728d65..8c3057f06e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -817,6 +817,7 @@ @ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr) @ stdcall ObReferenceObjectByPointer(ptr long ptr long) @ stub ObReferenceSecurityDescriptor +@ stdcall ObRegisterCallbacks(ptr ptr) @ stub ObReleaseObjectSecurity @ stub ObSetHandleAttributes @ stub ObSetSecurityDescriptorInfo diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 022ccb3ad8..ba0030f4bd 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1432,6 +1432,7 @@ static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) } void WINAPI ObDereferenceObject(void*); +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION*, void**); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE); -- 2.16.2

1 0

[PATCH 2/5] include: Add more types to ntifs.h (resend)
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ddk/ntifs.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 32c9e3084b..5e7dd18c7e 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -19,8 +19,24 @@ #ifndef __NTIFS_H__ #define __NTIFS_H__ +#include "ntddk.h" + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; +typedef enum _FS_FILTER_SECTION_SYNC_TYPE +{ + SyncTypeOther = 0, + SyncTypeCreateSection +} FS_FILTER_SECTION_SYNC_TYPE, *PFS_FILTER_SECTION_SYNC_TYPE; + +typedef struct _FS_FILTER_SECTION_SYNC_OUTPUT +{ + ULONG StructureSize; + ULONG SizeReturned; + ULONG Flags; + ULONG DesiredReadAlignment; +} FS_FILTER_SECTION_SYNC_OUTPUT, *PFS_FILTER_SECTION_SYNC_OUTPUT; + typedef struct _KQUEUE { DISPATCHER_HEADER Header; @@ -30,6 +46,7 @@ typedef struct _KQUEUE LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); #endif -- 2.16.2

1 0

[PATCH 1/5] include: Add more typedefs to wdm.h (resend)
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ddk/wdm.h | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 834f208cf9..022ccb3ad8 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -44,6 +44,7 @@ typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; typedef ULONG_PTR ERESOURCE_THREAD; typedef ERESOURCE_THREAD *PERESOURCE_THREAD; +typedef struct _FILE_GET_QUOTA_INFORMATION *PFILE_GET_QUOTA_INFORMATION; struct _KDPC; struct _KAPC; @@ -1223,6 +1224,102 @@ typedef struct _KLOCK_QUEUE_HANDLE { typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2); typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION; +typedef ULONG OB_OPERATION; + +typedef struct _OB_PRE_CREATE_HANDLE_INFORMATION { + ACCESS_MASK DesiredAccess; + ACCESS_MASK OriginalDesiredAccess; +} OB_PRE_CREATE_HANDLE_INFORMATION, *POB_PRE_CREATE_HANDLE_INFORMATION; + +typedef struct _OB_PRE_DUPLICATE_HANDLE_INFORMATION { + ACCESS_MASK DesiredAccess; + ACCESS_MASK OriginalDesiredAccess; + PVOID SourceProcess; + PVOID TargetProcess; +} OB_PRE_DUPLICATE_HANDLE_INFORMATION, *POB_PRE_DUPLICATE_HANDLE_INFORMATION; + +typedef union _OB_PRE_OPERATION_PARAMETERS { + OB_PRE_CREATE_HANDLE_INFORMATION CreateHandleInformation; + OB_PRE_DUPLICATE_HANDLE_INFORMATION DuplicateHandleInformation; +} OB_PRE_OPERATION_PARAMETERS, *POB_PRE_OPERATION_PARAMETERS; + +typedef struct _OB_PRE_OPERATION_INFORMATION { + OB_OPERATION Operation; + union { + ULONG Flags; + struct { + ULONG KernelHandle:1; + ULONG Reserved:31; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + PVOID Object; + POBJECT_TYPE ObjectType; + PVOID CallContext; + POB_PRE_OPERATION_PARAMETERS Parameters; +} OB_PRE_OPERATION_INFORMATION, *POB_PRE_OPERATION_INFORMATION; + +typedef struct _OB_POST_CREATE_HANDLE_INFORMATION { + IN ACCESS_MASK GrantedAccess; +} OB_POST_CREATE_HANDLE_INFORMATION, *POB_POST_CREATE_HANDLE_INFORMATION; + +typedef struct _OB_POST_DUPLICATE_HANDLE_INFORMATION { + IN ACCESS_MASK GrantedAccess; +} OB_POST_DUPLICATE_HANDLE_INFORMATION, *POB_POST_DUPLICATE_HANDLE_INFORMATION; + +typedef union _OB_POST_OPERATION_PARAMETERS { + IN OB_POST_CREATE_HANDLE_INFORMATION CreateHandleInformation; + IN OB_POST_DUPLICATE_HANDLE_INFORMATION DuplicateHandleInformation; +} OB_POST_OPERATION_PARAMETERS, *POB_POST_OPERATION_PARAMETERS; + +typedef struct _OB_POST_OPERATION_INFORMATION { + OB_OPERATION Operation; + union { + IN ULONG Flags; + struct { + ULONG KernelHandle:1; + ULONG Reserved:31; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + PVOID Object; + POBJECT_TYPE ObjectType; + PVOID CallContext; + NTSTATUS ReturnStatus; + POB_POST_OPERATION_PARAMETERS Parameters; +} OB_POST_OPERATION_INFORMATION,*POB_POST_OPERATION_INFORMATION; + +typedef enum _OB_PREOP_CALLBACK_STATUS { + OB_PREOP_SUCCESS +} OB_PREOP_CALLBACK_STATUS, *POB_PREOP_CALLBACK_STATUS; + +typedef OB_PREOP_CALLBACK_STATUS +(WINAPI *POB_PRE_OPERATION_CALLBACK)(void *context, POB_PRE_OPERATION_INFORMATION information); + +typedef void +(WINAPI *POB_POST_OPERATION_CALLBACK)(void *context, POB_POST_OPERATION_INFORMATION information); + +typedef struct _OB_OPERATION_REGISTRATION { + POBJECT_TYPE *ObjectType; + OB_OPERATION Operations; + POB_PRE_OPERATION_CALLBACK PreOperation; + POB_POST_OPERATION_CALLBACK PostOperation; +} OB_OPERATION_REGISTRATION, *POB_OPERATION_REGISTRATION; + +typedef struct _OB_CALLBACK_REGISTRATION { + USHORT Version; + USHORT OperationRegistrationCount; + UNICODE_STRING Altitude; + PVOID RegistrationContext; + OB_OPERATION_REGISTRATION *OperationRegistration; +} OB_CALLBACK_REGISTRATION, *POB_CALLBACK_REGISTRATION; + +#define OB_FLT_REGISTRATION_VERSION_0100 0x0100 +#define OB_FLT_REGISTRATION_VERSION OB_FLT_REGISTRATION_VERSION_0100 + +typedef enum _DIRECTORY_NOTIFY_INFORMATION_CLASS { + DirectoryNotifyInformation = 1, + DirectoryNotifyExtendedInformation +} DIRECTORY_NOTIFY_INFORMATION_CLASS, *PDIRECTORY_NOTIFY_INFORMATION_CLASS; + NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #ifdef NONAMELESSUNION -- 2.16.2

1 0

[PATCH] testbot: DateTimeToString() is not used anymore. Remove it.
by Francois Gouget 21 Mar '18

21 Mar '18

--- testbot/lib/WineTestBot/Utils.pm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index cc8e2b86d..5538ecd60 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -121,14 +121,6 @@ sub CreateNewDir($$) } } -sub DateTimeToString($) -{ - my ($Time) = @_; - -# my ($Sec, $Min, $Hour, $MDay, $Mon, $Year, $WDay, $YDay, $IsDst) = localtime($Time); - return strftime("%Y/%m/%d %H:%M:%S", localtime($Time)); -} - sub BuildEMailRecipient($$) { my ($EMailAddress, $Name) = @_; -- 2.16.2

1 0

[PATCH] testbot: Trace the pid of child processes being killed.
by Francois Gouget 21 Mar '18

21 Mar '18

This helps analysing the Engine log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7a35ba742..35bbe2a59 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -292,7 +292,12 @@ It is up to the caller to save the updated VM object. sub KillChild($) { my ($self) = @_; - kill("TERM", $self->ChildPid) if ($self->ChildPid); + if ($self->ChildPid) + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Killing child ". $self->ChildPid ."\n"); + kill("TERM", $self->ChildPid); + } $self->ChildPid(undef); } -- 2.16.2

1 0

[PATCH 2/2] testbot/web: Use GET to send the Activity period.
by Francois Gouget 21 Mar '18

21 Mar '18

This way when the page refreshes it automatically reuses the same period. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index d5fe6f3ae..ddea602e8 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -46,6 +46,7 @@ sub _initialize($$$) } $self->SUPER::_initialize($Request, $RequiredRole); + $self->{Method} = "get"; } sub GeneratePage($) -- 2.16.2

1 0

[PATCH 1/2] testbot/web: Let web pages decide whether to POST or GET the parameters.
by Francois Gouget 21 Mar '18

21 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 7669067f1..1745ec87b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -44,6 +44,7 @@ sub _initialize($$$$) $self->{PropertyDescriptors} = $PropertyDescriptors; $self->{HasRequired} = !1; $self->{ActionPerformed} = !1; + $self->{Method} = "post"; } sub GetPropertyDescriptors($) @@ -136,9 +137,9 @@ sub GenerateBody($) sub GenerateFormStart($) { - #my ($self) = @_; + my ($self) = @_; print "<form action='" . $ENV{"SCRIPT_NAME"} . - "' method='post' enctype='multipart/form-data'>\n"; + "' method='$self->{Method}' enctype='multipart/form-data'>\n"; } sub GenerateFields($) -- 2.16.2

1 0

[PATCH 1/2] appwiz.cpl: Introduce ARRAY_SIZE macro.
by Gijs Vermeulen 21 Mar '18

21 Mar '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/appwiz.cpl/appwiz.c | 24 ++++++++++++------------ dlls/appwiz.cpl/appwiz.h | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 38075559b2..dae9df9035 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -161,7 +161,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) APPINFO *info = NULL; LPWSTR iconPtr; - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); for (i = 0; RegEnumKeyExW(root, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS; ++i) @@ -172,7 +172,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) && dwType == REG_DWORD && value == 1) { RegCloseKey(hkeyApp); - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); continue; } displen = 0; @@ -197,7 +197,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) else { RegCloseKey(hkeyApp); - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); continue; } @@ -308,7 +308,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) } RegCloseKey(hkeyApp); - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); } return TRUE; @@ -501,7 +501,7 @@ static void UninstallProgram(int id, DWORD button) BOOL res; LoadStringW(hInst, IDS_UNINSTALL_FAILED, sUninstallFailed, - sizeof(sUninstallFailed) / sizeof(sUninstallFailed[0])); + ARRAY_SIZE(sUninstallFailed)); LIST_FOR_EACH_ENTRY( iter, &app_list, APPINFO, entry ) { @@ -617,7 +617,7 @@ static INT_PTR CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, L /* Load our "not specified" string */ LoadStringW(hInst, IDS_NOT_SPECIFIED, notfound, - sizeof(notfound) / sizeof(notfound[0])); + ARRAY_SIZE(notfound)); /* Update the data for items already read into the structure */ SetInfoDialogText(NULL, iter->publisher, notfound, hWnd, @@ -712,7 +712,7 @@ static BOOL AddListViewColumns(HWND hWnd) lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH; /* Add the columns */ - for (i = 0; i < sizeof(columns) / sizeof(columns[0]); i++) + for (i = 0; i < ARRAY_SIZE(columns); i++) { lvc.iSubItem = i; lvc.pszText = buf; @@ -721,7 +721,7 @@ static BOOL AddListViewColumns(HWND hWnd) lvc.cx = columns[i].width; lvc.fmt = columns[i].fmt; - LoadStringW(hInst, columns[i].title, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInst, columns[i].title, buf, ARRAY_SIZE(buf)); if (ListView_InsertColumnW(hWnd, i, &lvc) == -1) return FALSE; @@ -938,10 +938,10 @@ static void StartApplet(HWND hWnd) WCHAR tab_title[MAX_STRING_LEN], app_title[MAX_STRING_LEN]; /* Load the strings we will use */ - LoadStringW(hInst, IDS_TAB1_TITLE, tab_title, sizeof(tab_title) / sizeof(tab_title[0])); - LoadStringW(hInst, IDS_CPL_TITLE, app_title, sizeof(app_title) / sizeof(app_title[0])); - LoadStringW(hInst, IDS_REMOVE, btnRemove, sizeof(btnRemove) / sizeof(btnRemove[0])); - LoadStringW(hInst, IDS_MODIFY_REMOVE, btnModifyRemove, sizeof(btnModifyRemove) / sizeof(btnModifyRemove[0])); + LoadStringW(hInst, IDS_TAB1_TITLE, tab_title, ARRAY_SIZE(tab_title)); + LoadStringW(hInst, IDS_CPL_TITLE, app_title, ARRAY_SIZE(app_title)); + LoadStringW(hInst, IDS_REMOVE, btnRemove, ARRAY_SIZE(btnRemove)); + LoadStringW(hInst, IDS_MODIFY_REMOVE, btnModifyRemove, ARRAY_SIZE(btnModifyRemove)); /* Fill out the PROPSHEETPAGE */ psp.dwSize = sizeof (PROPSHEETPAGEW); diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index 2165ce11b1..d18d93aa5f 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -19,6 +19,8 @@ #include "wine/heap.h" #include "wine/unicode.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + typedef enum { ADDON_GECKO, ADDON_MONO -- 2.13.6

1 1

[PATCH] mshtml: Check if BSC is still attached to window before using it in OnRedirectVerifyCallback.
by Jacek Caban 20 Mar '18

20 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] vbscript/tests: Added named item ref count tests.
by Jacek Caban 20 Mar '18

20 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/run.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)

1 0

[PATCH] make_unicode: Implement Unicode decomposition.
by Sergio Gómez Del Real 20 Mar '18

20 Mar '18

Some notes: - The code is based on last year's GSoC project from Artur Świgoń. - Full decomposition is needed as part of the Unicode Normalization Algorithm, so this work is the first step to implement API functions such as NormalizeString(). - wine_decompose() was replaced by a more general function. Only code related to multi-byte character to wide character conversions used that function. Appropriate changes in mbtowc.c were made to call the new function, while the tests in tests/codepage.c still pass successfully. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- libs/port/mbtowc.c | 10 +- tools/make_unicode | 422 +++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 367 insertions(+), 65 deletions(-) diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82d8b..d78bfe81e6 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; +extern unsigned int wine_unicode_decompose_string( int compat, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ); /* check the code whether it is in Unicode Private Use Area (PUA). */ /* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ @@ -107,13 +107,13 @@ static int mbstowcs_sbcs_decompose( const struct sbcs_table *table, int flags, { WCHAR dummy[4]; /* no decomposition is larger than 4 chars */ for (len = 0; srclen; srclen--, src++) - len += wine_decompose( cp2uni[*src], dummy, 4 ); + len += wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dummy, 4 ); return len; } for (len = dstlen; srclen && len; srclen--, src++) { - unsigned int res = wine_decompose( cp2uni[*src], dst, len ); + unsigned int res = wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dst, len ); if (!res) break; len -= res; dst += res; @@ -219,7 +219,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - len += wine_decompose( ch, dummy, 4 ); + len += wine_unicode_decompose_string( 0, &ch, 1, dummy, 4 ); } return len; } @@ -234,7 +234,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - if (!(res = wine_decompose( ch, dst, len ))) break; + if (!(res = wine_unicode_decompose_string( 0, &ch, 1, dst, len ))) break; dst += res; len -= res; } diff --git a/tools/make_unicode b/tools/make_unicode index 92b0b64a94..3d224baa05 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -471,6 +471,26 @@ sub READ_DEFAULTS($) next if $decomp eq ""; # no decomposition, skip it + # store decomposition table + if ($decomp =~ /^<([a-zA-Z]+)>(\s+[0-9a-fA-F]+)+$/) + { + my @seq = (); + for my $ch (split /\s+/, (split /\s+/, $decomp, 2)[1]) + { + push @seq, (hex $ch); + } + $decomp_table[$src] = [1, \@seq]; + } + elsif ($decomp =~ /^([0-9a-fA-F]+)(\s+([0-9a-fA-F]+))*$/) + { + my @seq = (); + for my $ch (split /\s+/, $decomp) + { + push @seq, (hex $ch); + } + $decomp_table[$src] = [0, \@seq]; + } + if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) { # decomposition of the form "<foo> 1234" -> use char if type is known @@ -508,7 +528,6 @@ sub READ_DEFAULTS($) # store decomposition if it contains two chars if ($decomp =~ /^([0-9a-fA-F]+)\s+([0-9a-fA-F]+)$/) { - $decomp_table[$src] = [ hex $1, hex $2 ]; push @compose_table, [ hex $1, hex $2, $src ]; } elsif ($decomp =~ /^(<[a-z]+>\s)*([0-9a-fA-F]+)$/ && @@ -2258,6 +2277,51 @@ EOF save_file($filename); } +sub recursive_decomp +{ + my ($char, $table_ref, $compat) = @_; + + return ($char) unless defined $table_ref->[$char]; + my $data = $table_ref->[$char]; + return ($char) if $data->[0] && !$compat; + my @mapping = (); + for my $ch (@{$data->[1]}) + { + push @mapping, recursive_decomp( $ch, $table_ref, $compat ); + } + return @mapping; +} + +sub expand_pairs +{ + my @data = @_; + my @result = (); + + for my $ch (@data) + { + if ($ch <= 0xFFFF) + { + push @result, $ch; + } + elsif ($ch >= 2097152) # 2**21 + { + die sprintf "Invalid Unicode character %04x\n", $ch; + } + else + { + my $hx = $ch & 0xFFFF; + my $hu = ($ch >> 16) & ((1 << 5) - 1); + my $hw = ($hu - 1) & 0xFFFF; + my $hi = 0xD800 | ($hw << 6) | ($hx >> 10); + my $lx = $ch & 0xFFFF; + my $lo = (0xDC00 | ($lx & ((1 << 10) - 1))) & 0xFFFF; + push @result, $hi; + push @result, $lo; + } + } + return @result; +} + ################################################################ # dump the char decomposition table sub dump_decompose_table($) @@ -2266,98 +2330,336 @@ sub dump_decompose_table($) open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; - print OUTPUT "/* Unicode char composition */\n"; + print OUTPUT "/* Unicode char decomposition */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - # first determine all the 16-char subsets that contain something + my $utflim = 2097152; + my %nfd_lookup = (); + my %nfkd_lookup = (); + my %decomp_lookup = (); + my @decomp_data = (0); + my $pos = 1; + my $lastchar_decomp; - my @filled = (0) x 4096; - my $pos = 16*2; # for the null subset - for (my $i = 0; $i < 65536; $i++) + for (my $i = 0; $i < $utflim; $i++) { next unless defined $decomp_table[$i]; - $filled[$i >> 4] = $pos; - $pos += 16*2; - $i |= 15; + + if (defined $decomp_table[$i]) + { + $lastchar_decomp = $i; + # fully expand input and mappings + + my @char = expand_pairs( ($i) ); + push @char, 0; + my $char = pack "n*", @char; + + my @nfd = recursive_decomp( $i, \@decomp_table, 0 ); + @nfd = expand_pairs( @nfd ); + push @nfd, 0; + my $nfd = pack "n*", @nfd; + + my @nfkd = recursive_decomp( $i, \@decomp_table, 1 ); + @nfkd = expand_pairs( @nfkd ); + push @nfkd, 0; + my $nfkd = pack "n*", @nfkd; + + # lookup or add mappings + + if ($nfd eq $char) + { + $nfd = undef; + } + elsif (exists $decomp_lookup{$nfd}) + { + $nfd_lookup{$i} = $decomp_lookup{$nfd}; + } + else + { + push @decomp_data, @nfd; + $decomp_lookup{$nfd} = $pos; + $nfd_lookup{$i} = $pos; + $pos += @nfd; + } + + if ($nfkd eq $char) + { + $nfkd = undef; + } + elsif (exists $decomp_lookup{$nfkd}) + { + $nfkd_lookup{$i} = $decomp_lookup{$nfkd}; + } + else + { + push @decomp_data, @nfkd; + $decomp_lookup{$nfkd} = $pos; + $nfkd_lookup{$i} = $pos; + $pos += @nfkd; + } + } } - my $total = $pos; - # now count the 256-char subsets that contain something + printf OUTPUT "static const UINT last_decomposable = 0x%x;\n\n", $lastchar_decomp; + + # dump decomposition data + + printf OUTPUT "static const WCHAR data_decomp[%d] =\n", $pos; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @decomp_data ); + print OUTPUT "\n};\n\n"; - my @filled_idx = (256) x 256; - $pos = 256 + 16; - for (my $i = 0; $i < 4096; $i++) + # find 256-char subsets that contain something + + my $filled_pos = 1; + my $filled_lim = ($lastchar_decomp >> 8) + 1; + my @filled = (0) x $filled_lim; + for (my $i = 0; $i < $utflim; $i++) { - next unless $filled[$i]; - $filled_idx[$i >> 4] = $pos; - $pos += 16; - $i |= 15; + last if $i > $lastchar_decomp; + next unless exists $nfd_lookup{$i} || exists $nfkd_lookup{$i}; + $filled[$i >> 8] = $filled_pos++; + $i |= 255; } - my $null_offset = $pos; # null mapping - $total += $pos; - # add the index offsets to the subsets positions + # dump index of 256-char subsets + + printf OUTPUT "static const BYTE idx1_decomp[%d] =\n", $filled_lim; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%02x", 0, @filled ); + print OUTPUT "\n};\n\n"; + + # for 256-char subsets, find non-empty 16-char subsets - for (my $i = 0; $i < 4096; $i++) + my $sub_filled_pos = 1; + my %sub_filled = (); + for (my $i = 0; $i < $filled_lim; $i++) { next unless $filled[$i]; - $filled[$i] += $null_offset; + for (my $j = 0; $j < 256; $j++) + { + my $idx = ($i << 8) | $j; + next unless exists $nfd_lookup{$idx} || exists $nfkd_lookup{$idx}; + $sub_filled{$idx >> 4} = $sub_filled_pos++; + $j |= 15; + } } - # dump the main index + # dump index of 16-char subsets - printf OUTPUT "static const WCHAR table[%d] =\n", $total; - printf OUTPUT "{\n /* index */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @filled_idx ); - printf OUTPUT ",\n /* null sub-index */\n%s", DUMP_ARRAY( "0x%04x", 0, ($null_offset) x 16 ); - - # dump the second-level indexes - - for (my $i = 0; $i < 256; $i++) + printf OUTPUT "static const USHORT idx2_decomp[%d] =\n", $filled_pos * 16; + print OUTPUT "{\n"; + my @null_idx = (0) x 16; + print OUTPUT " /* null sub-index */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_idx ); + for (my $i = 0; $i < $filled_lim; $i++) { - next unless ($filled_idx[$i] > 256); - my @table = @filled[($i<<4)..($i<<4)+15]; - for (my $j = 0; $j < 16; $j++) { $table[$j] ||= $null_offset; } - printf OUTPUT ",\n /* sub-index %02x */\n", $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + next unless $filled[$i]; + printf OUTPUT ",\n /* sub-index 0x%02x */\n", $filled[$i]; + + my @sub_idx; + for (my $j = 0; $j < 16; $j++) + { + my $idx = ($i << 4) | $j; + $sub_idx[$j] = $sub_filled{$idx} || 0; + } + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_idx ); } + print OUTPUT "\n};\n\n"; # dump the 16-char subsets - printf OUTPUT ",\n /* null mapping */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, (0) x 32 ); - - for (my $i = 0; $i < 4096; $i++) + printf OUTPUT "static const USHORT offsets_decomp[%d] =\n", 32 * $sub_filled_pos; + print OUTPUT "{\n"; + print OUTPUT " /* (nfd, nfkd) x 16 */\n"; + my @null_table = (0) x 32; + print OUTPUT " /* no decomposition */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_table ); + for my $key (sort {$a <=> $b} keys %sub_filled) { - next unless $filled[$i]; - my @table = (0) x 32; + printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $key, $key; + my @sub_table; for (my $j = 0; $j < 16; $j++) { - if (defined $decomp_table[($i<<4) + $j]) - { - $table[2 * $j] = ${$decomp_table[($i << 4) + $j]}[0]; - $table[2 * $j + 1] = ${$decomp_table[($i << 4) + $j]}[1]; - } + my $idx = ($key << 4) | $j; + $sub_table[2 * $j] = $nfd_lookup{$idx} || 0; + $sub_table[2 * $j + 1] = $nfkd_lookup{$idx} || 0; } - printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $i, $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_table ); } + print OUTPUT "\n};\n\n"; - printf OUTPUT "\n};\n\n"; print OUTPUT <<"EOF"; -unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +static const WCHAR *unicode_table_lookup( UINT cp, int compat, const BYTE *idx1, UINT scale_idx1, + const USHORT *idx2, UINT scale_idx2, const USHORT *offsets, + UINT scale_off, const WCHAR *data ) { - const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - unsigned int res; + USHORT a, b, c, d; + a = idx1[cp >> scale_idx1]; + b = idx2[(a << scale_idx2) + ((cp >> scale_idx2) & 0xf)]; + c = (b << scale_off) + ((cp & 0xf) << 1); + if (compat) ++c; + d = offsets[c]; + return &data[d]; +} - *dst = ch; - if (!*ptr) return 1; - if (dstlen <= 1) return 0; - /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; - return res; +static inline int decompose_hangul( WCHAR ch, WCHAR dst[4], int dstlen ) +{ + static const WCHAR sbase = 0xac00, lbase = 0x1100, vbase = 0x1161, tbase = 0x11a7; + static const WCHAR /*lcount = 19, vcount = 21,*/ tcount = 28, ncount = 588/*, scount = 11172*/; + WCHAR sindex, lindex, vindex, tindex; + if (ch >= 0xac00 && ch <= 0xd7af) + { + sindex = ch - sbase; + lindex = sindex / ncount; + vindex = (sindex % ncount) / tcount; + tindex = sindex % tcount; + dst[0] = lbase + lindex; + dst[1] = vbase + vindex; + dst[2] = (tindex > 0) ? (tbase + tindex) : 0; + dst[3] = 0; + } + else + { + dst[0] = ch; + dst[1] = 0; + } + + return 0; +} + +static inline UINT utf16_codepoint_to_surrogates( UINT cp ) +{ + UINT ch = cp; + + WCHAR hx, hw, lx; + UINT hu; + hx = (WCHAR)cp; + hu = (cp >> 16) & ((1 << 5) - 1); + hw = (WCHAR)hu - 1; + lx = (WCHAR)cp; + ch = 0xD800 | (hw << 6) | (hx >> 10); + ch |= (0xDC00 | (lx & ((1 << 10) - 1)))<<16; + + return ch; +} + +static inline UINT utf16_surrogates_to_codepoint( WCHAR hi, WCHAR lo ) +{ + UINT x, w, u, c; + x = ((hi & ((1 << 6) - 1)) << 10) | (lo & ((1 << 10) - 1)); + w = (hi >> 6) & ((1 << 5) - 1); + u = w + 1; + c = (u << 16) | x; + return c; +} + +static int decompose_char_recursive( int compat, UINT ch, WCHAR *dst, int dstlen ) +{ + const WCHAR *map = NULL; + int size_decomp = 0; + int total_decomp = 0; + + if (ch < 0xa0) /* fast path */ + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + else if (ch >= 0xac00 && ch <= 0xd7af) /* hangul */ + { + WCHAR dum[4]; + int len = 0, i = 0; + + decompose_hangul(ch, dum, dstlen); + while (dst[i]) + { + if (dstlen-i) dst[i] = dum[i]; + i++; + len++; + } + return len; + } + else if (ch > last_decomposable || + !*(map = unicode_table_lookup(ch, compat, idx1_decomp, 8, + idx2_decomp, 4, offsets_decomp, 5, data_decomp))) + { + if (ch > 0xffff) + { + ch = utf16_codepoint_to_surrogates(ch); + if (dstlen) *dst = (WCHAR)ch; + if (dstlen-1) *(dst+1) = (WCHAR)(ch>>16); + return 2; + } + else + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + } + else { + while (*map) + { + size_decomp = decompose_char_recursive(compat, *map, dst, dstlen); + dstlen -= size_decomp; + if (dstlen < 0) dstlen = 0; + dst += size_decomp; + map++; + total_decomp += size_decomp; + } + return total_decomp; + } +} + +unsigned int wine_unicode_decompose_string( int compat, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +{ + UINT ch; + int srcpos = 0, dstpos = 0, r; + + if (srclen == -1) srclen = strlenW(src); + + if (dstlen < 0) dstlen = 0; + + while (srcpos < srclen) + { + ch = src[srcpos]; + + if (ch >= 0xd800 && ch <= 0xdbff) /* high surrogate */ + { + WCHAR hi, lo; + if (srcpos+1 == srclen) return srcpos; + hi = (WCHAR)ch; + lo = src[++srcpos]; + if (lo < 0xdc00 || lo > 0xdfff) return srcpos; + ch = utf16_surrogates_to_codepoint(hi, lo); + } + else if (ch >= 0xdc00 && ch <= 0xdfff) /* low surrogate */ + { + return srcpos; + } + + r = decompose_char_recursive(compat, ch, dst+dstpos, dstlen); + dstpos += r; + + if (dstlen > 0) + { + dstlen -= r; + if (dstlen <= 0) + { + while (dstlen < 0) + { + dstpos--; + dstlen++; + } + break; + } + } + + ++srcpos; + } + + return dstpos; } EOF close OUTPUT; -- 2.14.1

1 0

[PATCH 4/4] msvcp140: Add __uncaught_exceptions implementation
by Piotr Caban 20 Mar '18

20 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/exception.c | 7 +++++++ dlls/msvcp90/msvcp90.h | 4 ++++ dlls/msvcp90/msvcp_main.c | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-)

1 0

[PATCH 3/4] msvcrt: Fix __uncaught_exception implementation
by Piotr Caban 20 Mar '18

20 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/except.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/4] ucrtbase: Add __processing_throw implementation
by Piotr Caban 20 Mar '18

20 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/except.c | 9 +++++++++ dlls/msvcrt/except_i386.c | 6 ++++-- dlls/msvcrt/except_x86_64.c | 4 ++++ dlls/msvcrt/msvcrt.h | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 7 files changed, 21 insertions(+), 5 deletions(-)

1 0

[PATCH 1/4] ucrtbase: Add __current_exception_context() implementation
by Piotr Caban 20 Mar '18

20 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/except.c | 25 ++++++++++++++++------ dlls/msvcrt/except_i386.c | 10 ++++++--- dlls/msvcrt/except_x86_64.c | 20 ++++++++++------- dlls/msvcrt/msvcrt.h | 5 +++-- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 7 files changed, 43 insertions(+), 23 deletions(-)

1 0

[PATCH 4/5] wined3d: Merge wined3d_surface_upload_data() into texture2d_upload_data().
by Henri Verbeet 20 Mar '18

20 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 170 ++--------------------------------------- dlls/wined3d/texture.c | 149 +++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 5 -- 3 files changed, 154 insertions(+), 170 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 34f3ff3751e..3760abbff94 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -772,162 +772,11 @@ static void texture2d_download_data(struct wined3d_texture *texture, unsigned in heap_free(temporary_mem); } -/* This call just uploads data, the caller is responsible for binding the - * correct texture. */ -/* Context activation is done by the caller. */ -void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, - const struct wined3d_box *src_box, unsigned int src_pitch, unsigned int dst_x, unsigned int dst_y, - BOOL srgb, const struct wined3d_const_bo_address *data) -{ - unsigned int update_w = src_box->right - src_box->left; - unsigned int update_h = src_box->bottom - src_box->top; - unsigned int level, layer; - GLenum target; - - TRACE("texure %p, sub_resource_idx %u, gl_info %p, format %s, src_box %s, " - "src_pitch %u, dst_x %u, dst_y %u, srgb %#x, data {%#x:%p}.\n", - texture, sub_resource_idx, gl_info, debug_d3dformat(format->id), debug_box(src_box), - src_pitch, dst_x, dst_y, srgb, data->buffer_object, data->addr); - - if (texture->sub_resources[sub_resource_idx].map_count) - { - WARN("Uploading a texture that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); - texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; - } - - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_HEIGHT_SCALE) - { - update_h *= format->height_scale.numerator; - update_h /= format->height_scale.denominator; - } - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, data->buffer_object)); - checkGLcall("glBindBuffer"); - } - - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - level = sub_resource_idx % texture->level_count; - layer = sub_resource_idx / texture->level_count; - - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) - { - unsigned int dst_row_pitch, dst_slice_pitch; - const BYTE *addr = data->addr; - GLenum internal; - - addr += (src_box->top / format->block_height) * src_pitch; - addr += (src_box->left / format->block_width) * format->block_byte_count; - - if (srgb) - internal = format->glGammaInternal; - else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET - && wined3d_resource_is_offscreen(&texture->resource)) - internal = format->rtInternal; - else - internal = format->glInternal; - - wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); - - TRACE("Uploading compressed data, target %#x, level %u, layer %u, " - "x %u, y %u, w %u, h %u, format %#x, image_size %#x, addr %p.\n", - target, level, layer, dst_x, dst_y, update_w, update_h, internal, dst_slice_pitch, addr); - - if (dst_row_pitch == src_pitch) - { - if (target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, - layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); - } - else - { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, dst_y, - update_w, update_h, internal, dst_slice_pitch, addr)); - } - } - else - { - UINT row_count = (update_h + format->block_height - 1) / format->block_height; - UINT row, y; - - /* glCompressedTexSubImage2D() ignores pixel store state, so we - * can't use the unpack row length like for glTexSubImage2D. */ - for (row = 0, y = dst_y; row < row_count; ++row) - { - if (target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, - layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); - } - else - { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, - update_w, format->block_height, internal, dst_row_pitch, addr)); - } - - y += format->block_height; - addr += src_pitch; - } - } - checkGLcall("Upload compressed texture data"); - } - else - { - const BYTE *addr = data->addr; - - addr += src_box->top * src_pitch; - addr += src_box->left * format->byte_count; - - TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " - "format %#x, type %#x, addr %p.\n", - target, level, layer, dst_x, dst_y, - update_w, update_h, format->glFormat, format->glType, addr); - - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); - if (target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, - layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); - } - else - { - gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y, - update_w, update_h, format->glFormat, format->glType, addr); - } - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - checkGLcall("Upload texture data"); - } - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - } - - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); - - if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) - { - struct wined3d_device *device = texture->resource.device; - unsigned int i; - - for (i = 0; i < device->context_count; ++i) - { - context_texture_update(device->contexts[i], texture); - } - } -} - static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) { unsigned int src_row_pitch, src_slice_pitch; - const struct wined3d_gl_info *gl_info; unsigned int src_level, dst_level; struct wined3d_context *context; struct wined3d_bo_address data; @@ -939,7 +788,6 @@ static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture src_texture, src_sub_resource_idx, debug_box(src_box)); context = context_acquire(dst_texture->resource.device, NULL, 0); - gl_info = context->gl_info; /* Only load the sub-resource for partial updates. For newly allocated * textures the texture wouldn't be the current location, and we'd upload @@ -959,8 +807,8 @@ static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture src_texture->sub_resources[src_sub_resource_idx].locations); wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); - wined3d_surface_upload_data(dst_texture, dst_sub_resource_idx, gl_info, src_texture->resource.format, - src_box, src_row_pitch, dst_x, dst_y, FALSE, wined3d_const_bo_address(&data)); + wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, src_texture->resource.format, + src_box, wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, dst_x, dst_y, 0, FALSE); context_release(context); @@ -1239,7 +1087,6 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr const struct wined3d_format *src_format = src_texture->resource.format; struct wined3d_device *device = src_texture->resource.device; const struct d3dfmt_converter_desc *conv = NULL; - const struct wined3d_gl_info *gl_info = NULL; unsigned int src_row_pitch, src_slice_pitch; struct wined3d_context *context = NULL; struct wined3d_texture *dst_texture; @@ -1277,10 +1124,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr } if (device->d3d_initialized) - { context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; - } map_binding = src_texture->resource.map_binding; if (!wined3d_texture_load_location(src_texture, sub_resource_idx, context, map_binding)) @@ -1320,8 +1164,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr wined3d_texture_prepare_texture(dst_texture, context, FALSE); wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - wined3d_surface_upload_data(dst_texture, 0, gl_info, src_format, - &src_box, src_row_pitch, 0, 0, FALSE, wined3d_const_bo_address(&src_data)); + wined3d_texture_upload_data(dst_texture, 0, context, src_format, &src_box, + wined3d_const_bo_address(&src_data), src_row_pitch, src_slice_pitch, 0, 0, 0, FALSE); wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, 0, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2269,6 +2113,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re format.upload(src_mem, dst_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, width, height, 1); src_row_pitch = dst_row_pitch; + src_slice_pitch = dst_slice_pitch; context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); data.buffer_object = 0; @@ -2295,14 +2140,15 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re conversion->convert(src_mem, src_row_pitch, dst_mem, dst_row_pitch, width, height, palette, &texture->async.gl_color_key); src_row_pitch = dst_row_pitch; + src_slice_pitch = dst_slice_pitch; context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); data.buffer_object = 0; data.addr = dst_mem; } - wined3d_surface_upload_data(texture, sub_resource_idx, gl_info, &format, &src_box, - src_row_pitch, 0, 0, srgb, wined3d_const_bo_address(&data)); + wined3d_texture_upload_data(texture, sub_resource_idx, context, &format, &src_box, + wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, 0, 0, 0, srgb); heap_free(dst_mem); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 29bcfb1e4df..e8f5af33635 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1753,13 +1753,156 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); } +/* This call just uploads data, the caller is responsible for binding the + * correct texture. */ +/* Context activation is done by the caller. */ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, - const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, + const struct wined3d_const_bo_address *data, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { - wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, - format, src_box, row_pitch, dst_x, dst_y, srgb, data); + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int update_w = src_box->right - src_box->left; + unsigned int update_h = src_box->bottom - src_box->top; + unsigned int level, layer; + GLenum target; + + TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " + "src_row_pitch %#x, src_slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u, srgb %#x.\n", + texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), + data->buffer_object, data->addr, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); + + if (texture->sub_resources[sub_resource_idx].map_count) + { + WARN("Uploading a texture that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); + texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; + } + + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_HEIGHT_SCALE) + { + update_h *= format->height_scale.numerator; + update_h /= format->height_scale.denominator; + } + + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, data->buffer_object)); + checkGLcall("glBindBuffer"); + } + + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + level = sub_resource_idx % texture->level_count; + layer = sub_resource_idx / texture->level_count; + + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + { + unsigned int dst_row_pitch, dst_slice_pitch; + const BYTE *addr = data->addr; + GLenum internal; + + addr += (src_box->top / format->block_height) * src_row_pitch; + addr += (src_box->left / format->block_width) * format->block_byte_count; + + if (srgb) + internal = format->glGammaInternal; + else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET + && wined3d_resource_is_offscreen(&texture->resource)) + internal = format->rtInternal; + else + internal = format->glInternal; + + wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); + + TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " + "format %#x, image_size %#x, addr %p.\n", + target, level, layer, dst_x, dst_y, + update_w, update_h, internal, dst_slice_pitch, addr); + + if (dst_row_pitch == src_row_pitch) + { + if (target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, + layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); + } + else + { + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, dst_y, + update_w, update_h, internal, dst_slice_pitch, addr)); + } + } + else + { + UINT row_count = (update_h + format->block_height - 1) / format->block_height; + UINT row, y; + + /* glCompressedTexSubImage2D() ignores pixel store state, so we + * can't use the unpack row length like for glTexSubImage2D. */ + for (row = 0, y = dst_y; row < row_count; ++row) + { + if (target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, + layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); + } + else + { + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, + update_w, format->block_height, internal, dst_row_pitch, addr)); + } + + y += format->block_height; + addr += src_row_pitch; + } + } + checkGLcall("Upload compressed texture data"); + } + else + { + const BYTE *addr = data->addr; + + addr += src_box->top * src_row_pitch; + addr += src_box->left * format->byte_count; + + TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " + "format %#x, type %#x, addr %p.\n", + target, level, layer, dst_x, dst_y, + update_w, update_h, format->glFormat, format->glType, addr); + + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / format->byte_count); + if (target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, + layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); + } + else + { + gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y, + update_w, update_h, format->glFormat, format->glType, addr); + } + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + checkGLcall("Upload texture data"); + } + + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } + + if (wined3d_settings.strict_draw_ordering) + gl_info->gl_ops.gl.p_glFlush(); + + if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) + { + struct wined3d_device *device = texture->resource.device; + unsigned int i; + + for (i = 0; i < device->context_count; ++i) + { + context_texture_update(device->contexts[i], texture); + } + } } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 580f35a924b..311e292d998 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3335,11 +3335,6 @@ struct fbo_entry } key; }; -void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, - const struct wined3d_box *src_box, unsigned int src_pitch, unsigned int dst_x, unsigned int dst_y, - BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; - void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Allow wined3d_texture_upload_data() to upload to WINED3D_LOCATION_TEXTURE_SRGB.
by Henri Verbeet 20 Mar '18

20 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/texture.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b08e91b1496..f7ae3be184f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2121,7 +2121,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, dst_texture->resource.format, &op->src_box, wined3d_const_bo_address(&addr), - row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front); + row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front, FALSE); wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2216,8 +2216,8 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_bind_and_dirtify(texture, context, FALSE); wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); - wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, - &src_box, &addr, op->data.row_pitch, op->data.slice_pitch, box->left, box->top, box->front); + wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, &src_box, + &addr, op->data.row_pitch, op->data.slice_pitch, box->left, box->top, box->front, FALSE); wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 551d9fdfd3c..29bcfb1e4df 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1747,19 +1747,19 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { texture->texture_ops->texture_upload_data(texture, sub_resource_idx, context, - format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z); + format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, - format, src_box, row_pitch, dst_x, dst_y, FALSE, data); + format, src_box, row_pitch, dst_x, dst_y, srgb, data); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ @@ -2392,7 +2392,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { unsigned int level = sub_resource_idx % texture->level_count; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2402,9 +2402,9 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int void *converted_mem = NULL; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " - "row_pitch %#x, slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u.\n", + "row_pitch %#x, slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u, srgb %#x.\n", texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), - data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z); + data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); if (src_box) { @@ -2520,7 +2520,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, - NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0); + NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); heap_free(data.addr); } @@ -2546,8 +2546,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, - texture->resource.format, NULL, &data, row_pitch, slice_pitch, 0, 0, 0); + texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { @@ -2555,8 +2555,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, - texture->resource.format, NULL, &data, row_pitch, slice_pitch, 0, 0, 0); + texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e48f82ac70d..580f35a924b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3086,7 +3086,7 @@ struct wined3d_texture_ops void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, - unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z); + unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); }; @@ -3287,7 +3287,7 @@ void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *tex void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) DECLSPEC_HIDDEN; + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass independent source and destination coordinates to wined3d_texture_upload_data().
by Henri Verbeet 20 Mar '18

20 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 16 +++---- dlls/wined3d/texture.c | 97 ++++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 10 +++-- 3 files changed, 48 insertions(+), 75 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5581791fe59..b08e91b1496 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2085,13 +2085,6 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * goto error; } - if (op->src_box.left || op->src_box.top || op->src_box.front) - { - FIXME("Source box %s not supported for %s resources.\n", - debug_box(&op->src_box), debug_d3dresourcetype(op->dst_resource->type)); - goto error; - } - dst_texture = texture_from_resource(op->dst_resource); src_texture = texture_from_resource(op->src_resource); @@ -2126,8 +2119,9 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * &row_pitch, &slice_pitch); wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, dst_texture->resource.format, - &op->dst_box, wined3d_const_bo_address(&addr), row_pitch, slice_pitch); + wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, + dst_texture->resource.format, &op->src_box, wined3d_const_bo_address(&addr), + row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front); wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2184,6 +2178,7 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi struct wined3d_const_bo_address addr; struct wined3d_context *context; struct wined3d_texture *texture; + struct wined3d_box src_box; context = context_acquire(cs->device, NULL, 0); @@ -2220,8 +2215,9 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_bind_and_dirtify(texture, context, FALSE); + wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, - box, &addr, op->data.row_pitch, op->data.slice_pitch); + &src_box, &addr, op->data.row_pitch, op->data.slice_pitch, box->left, box->top, box->front); wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 75f4cee3911..551d9fdfd3c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1745,42 +1745,21 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, - const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) { - texture->texture_ops->texture_upload_data(texture, sub_resource_idx, - context, format, box, data, row_pitch, slice_pitch); + texture->texture_ops->texture_upload_data(texture, sub_resource_idx, context, + format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, - const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) { - struct wined3d_box src_box; - unsigned int texture_level; - unsigned int dst_x, dst_y; - - src_box.left = 0; - src_box.top = 0; - src_box.front = 0; - src_box.back = 1; - if (box) - { - dst_x = box->left; - dst_y = box->top; - src_box.right = box->right - box->left; - src_box.bottom = box->bottom - box->top; - } - else - { - dst_x = dst_y = 0; - texture_level = sub_resource_idx % texture->level_count; - src_box.right = wined3d_texture_get_level_width(texture, texture_level); - src_box.bottom = wined3d_texture_get_level_height(texture, texture_level); - } - wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, - format, &src_box, row_pitch, dst_x, dst_y, FALSE, data); + format, src_box, row_pitch, dst_x, dst_y, FALSE, data); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ @@ -2411,41 +2390,37 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc * correct texture. */ /* Context activation is done by the caller. */ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, - const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) { unsigned int level = sub_resource_idx % texture->level_count; const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int x, y, z, update_w, update_h, update_d; unsigned int dst_row_pitch, dst_slice_pitch; - unsigned int width, height, depth; - const void *mem = data->addr; + unsigned int update_w, update_h, update_d; + const BYTE *addr = data->addr; void *converted_mem = NULL; - TRACE("texture %p, sub_resource_idx %u, context %p, format %s, " - "box %s, data {%#x:%p}, row_pitch %#x, slice_pitch %#x.\n", - texture, sub_resource_idx, context, debug_d3dformat(format->id), - debug_box(box), data->buffer_object, data->addr, row_pitch, slice_pitch); + TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " + "row_pitch %#x, slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u.\n", + texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), + data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z); - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); - depth = wined3d_texture_get_level_depth(texture, level); - - if (!box) + if (src_box) { - x = y = z = 0; - update_w = width; - update_h = height; - update_d = depth; + addr += src_box->front * slice_pitch; + addr += src_box->top * row_pitch; + addr += src_box->left * format->byte_count; + + update_w = src_box->right - src_box->left; + update_h = src_box->bottom - src_box->top; + update_d = src_box->back - src_box->front; } else { - x = box->left; - y = box->top; - z = box->front; - update_w = box->right - box->left; - update_h = box->bottom - box->top; - update_d = box->back - box->front; + update_w = wined3d_texture_get_level_width(texture, level); + update_h = wined3d_texture_get_level_height(texture, level); + update_d = wined3d_texture_get_level_depth(texture, level); } if (format->conv_byte_count) @@ -2459,9 +2434,9 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int dst_slice_pitch = dst_row_pitch * update_h; converted_mem = heap_calloc(update_d, dst_slice_pitch); - format->upload(data->addr, converted_mem, row_pitch, slice_pitch, + format->upload(addr, converted_mem, row_pitch, slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - mem = converted_mem; + addr = converted_mem; } else { @@ -2476,8 +2451,8 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int checkGLcall("glBindBuffer"); } - GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, level, x, y, z, - update_w, update_h, update_d, format->glFormat, format->glType, mem)); + GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, level, dst_x, dst_y, dst_z, + update_w, update_h, update_d, format->glFormat, format->glType, addr)); checkGLcall("glTexSubImage3D"); if (data->buffer_object) @@ -2545,7 +2520,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, - NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch); + NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0); heap_free(data.addr); } @@ -2572,7 +2547,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); texture3d_upload_data(texture, sub_resource_idx, context, - texture->resource.format, NULL, &data, row_pitch, slice_pitch); + texture->resource.format, NULL, &data, row_pitch, slice_pitch, 0, 0, 0); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { @@ -2581,7 +2556,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); texture3d_upload_data(texture, sub_resource_idx, context, - texture->resource.format, NULL, &data, row_pitch, slice_pitch); + texture->resource.format, NULL, &data, row_pitch, slice_pitch, 0, 0, 0); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8de352b8447..e48f82ac70d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3084,8 +3084,9 @@ struct gl_texture struct wined3d_texture_ops { void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, - const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch); + const struct wined3d_context *context, const struct wined3d_format *format, + const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, + unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); }; @@ -3284,8 +3285,9 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, HWND window, RECT *rect) DECLSPEC_HIDDEN; void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, - const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a format to wined3d_texture_upload_data().
by Henri Verbeet 20 Mar '18

20 Mar '18

The goal here is to eventually get rid of wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/texture.c | 26 ++++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0db2daa4893..5581791fe59 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2126,8 +2126,8 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * &row_pitch, &slice_pitch); wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, &op->dst_box, - wined3d_const_bo_address(&addr), row_pitch, slice_pitch); + wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, dst_texture->resource.format, + &op->dst_box, wined3d_const_bo_address(&addr), row_pitch, slice_pitch); wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2220,7 +2220,7 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_bind_and_dirtify(texture, context, FALSE); - wined3d_texture_upload_data(texture, op->sub_resource_idx, context, + wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, box, &addr, op->data.row_pitch, op->data.slice_pitch); wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 83c7a41632f..75f4cee3911 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1745,15 +1745,15 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { texture->texture_ops->texture_upload_data(texture, sub_resource_idx, - context, box, data, row_pitch, slice_pitch); + context, format, box, data, row_pitch, slice_pitch); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { struct wined3d_box src_box; @@ -1780,7 +1780,7 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int } wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, - texture->resource.format, &src_box, row_pitch, dst_x, dst_y, FALSE, data); + format, &src_box, row_pitch, dst_x, dst_y, FALSE, data); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ @@ -2411,10 +2411,9 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc * correct texture. */ /* Context activation is done by the caller. */ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { - const struct wined3d_format *format = texture->resource.format; unsigned int level = sub_resource_idx % texture->level_count; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int x, y, z, update_w, update_h, update_d; @@ -2423,9 +2422,10 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int const void *mem = data->addr; void *converted_mem = NULL; - TRACE("texture %p, sub_resource_idx %u, context %p, box %s, data {%#x:%p}, row_pitch %#x, slice_pitch %#x.\n", - texture, sub_resource_idx, context, debug_box(box), - data->buffer_object, data->addr, row_pitch, slice_pitch); + TRACE("texture %p, sub_resource_idx %u, context %p, format %s, " + "box %s, data {%#x:%p}, row_pitch %#x, slice_pitch %#x.\n", + texture, sub_resource_idx, context, debug_d3dformat(format->id), + debug_box(box), data->buffer_object, data->addr, row_pitch, slice_pitch); width = wined3d_texture_get_level_width(texture, level); height = wined3d_texture_get_level_height(texture, level); @@ -2544,7 +2544,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); - texture3d_upload_data(texture, sub_resource_idx, context, + texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch); heap_free(data.addr); @@ -2571,7 +2571,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, NULL, &data, row_pitch, slice_pitch); + texture3d_upload_data(texture, sub_resource_idx, context, + texture->resource.format, NULL, &data, row_pitch, slice_pitch); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { @@ -2579,7 +2580,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, NULL, &data, row_pitch, slice_pitch); + texture3d_upload_data(texture, sub_resource_idx, context, + texture->resource.format, NULL, &data, row_pitch, slice_pitch); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c655c4bf30..8de352b8447 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3084,7 +3084,7 @@ struct gl_texture struct wined3d_texture_ops { void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); @@ -3284,7 +3284,7 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, HWND window, RECT *rect) DECLSPEC_HIDDEN; void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[v2 PATCH 5/5] bcrypt: Allow to call BCryptSetProperty on key objects.
by Alistair Leslie-Hughes 20 Mar '18

20 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 89 ++++++++++++++++++++++++++++++++-------------- dlls/bcrypt/tests/bcrypt.c | 4 +++ 2 files changed, 67 insertions(+), 26 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index a08eb00269..c5eefa49f4 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -679,32 +679,6 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu } } -NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -{ - struct object *object = handle; - - TRACE( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); - - if (!object) return STATUS_INVALID_HANDLE; - - switch (object->magic) - { - case MAGIC_ALG: - { - struct algorithm *alg = (struct algorithm *)object; - return set_alg_property( alg, prop, value, size, flags ); - } - case MAGIC_KEY: - { - FIXME( "keys not implemented yet\n" ); - return STATUS_NOT_IMPLEMENTED; - } - default: - WARN( "unknown magic %08x\n", object->magic ); - return STATUS_INVALID_HANDLE; - } -} - NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen, UCHAR *secret, ULONG secretlen, ULONG flags ) { @@ -954,6 +928,57 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_SUCCESS; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + { + key->mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) + { + key->mode = MODE_ID_GCM; + return STATUS_SUCCESS; + } + else + { + FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + return STATUS_NOT_IMPLEMENTED; + } + } + + FIXME( "unsupported key property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + struct object *object = handle; + + TRACE( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); + + if (!object) return STATUS_INVALID_HANDLE; + + switch (object->magic) + { + case MAGIC_ALG: + { + struct algorithm *alg = (struct algorithm *)object; + return set_alg_property( alg, prop, value, size, flags ); + } + case MAGIC_KEY: + { + struct key *key = (struct key *)object; + return set_key_property( key, prop, value, size, flags ); + } + default: + WARN( "unknown magic %08x\n", object->magic ); + return STATUS_INVALID_HANDLE; + } +} + static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { switch (key->alg_id) @@ -1089,6 +1114,12 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_SUCCESS; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { CCCryptorStatus status; @@ -1171,6 +1202,12 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { ERR( "support for keys not available at build time\n" ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1176796dbc..9922e4114f 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -525,6 +525,10 @@ static void test_BCryptGenerateSymmetricKey(void) sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = pBCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, + sizeof(BCRYPT_CHAIN_MODE_CBC), 0); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret); + size = 0xdeadbeef; ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 2.16.2

2 1

[v2 PATCH 4/5] include: Add ecdsa and asymmetric key related bcrypt definitions.
by Alistair Leslie-Hughes 20 Mar '18

20 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/bcrypt.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index d0b29c7cdd..717d77c731 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -61,6 +61,8 @@ typedef LONG NTSTATUS; #define BCRYPT_OPAQUE_KEY_BLOB (const WCHAR []){'O','p','a','q','u','e','K','e','y','B','l','o','b',0} #define BCRYPT_KEY_DATA_BLOB (const WCHAR []){'K','e','y','D','a','t','a','B','l','o','b',0} #define BCRYPT_AES_WRAP_KEY_BLOB (const WCHAR []){'R','f','c','3','5','6','5','K','e','y','W','r','a','p','B','l','o','b',0} +#define BCRYPT_ECCPUBLIC_BLOB (const WCHAR []){'E','C','C','P','U','B','L','I','C','B','L','O','B',0} +#define BCRYPT_ECCPRIVATE_BLOB (const WCHAR []){'E','C','C','P','R','I','V','A','T','E','B','L','O','B',0} #define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} @@ -76,6 +78,9 @@ typedef LONG NTSTATUS; #define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} #define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} #define BCRYPT_SHA512_ALGORITHM (const WCHAR []){'S','H','A','5','1','2',0} +#define BCRYPT_ECDSA_P256_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','2','5','6',0} +#define BCRYPT_ECDSA_P384_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','3','8','4',0} +#define BCRYPT_ECDSA_P521_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','5','2','1',0} #define BCRYPT_CHAIN_MODE_NA (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','N','/','A',0} #define BCRYPT_CHAIN_MODE_CBC (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','B','C',0} @@ -84,6 +89,13 @@ typedef LONG NTSTATUS; #define BCRYPT_CHAIN_MODE_CCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','C','M',0} #define BCRYPT_CHAIN_MODE_GCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0} +#define BCRYPT_ECDSA_PUBLIC_P256_MAGIC 0x31534345 +#define BCRYPT_ECDSA_PRIVATE_P256_MAGIC 0x32534345 +#define BCRYPT_ECDSA_PUBLIC_P384_MAGIC 0x33534345 +#define BCRYPT_ECDSA_PRIVATE_P384_MAGIC 0x34534345 +#define BCRYPT_ECDSA_PUBLIC_P521_MAGIC 0x35534345 +#define BCRYPT_ECDSA_PRIVATE_P521_MAGIC 0x36534345 + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName; @@ -115,6 +127,23 @@ typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO ULONG dwFlags; } BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO, *PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO; +typedef struct _BCRYPT_ECCKEY_BLOB +{ + ULONG dwMagic; + ULONG cbKey; +} BCRYPT_ECCKEY_BLOB, *PBCRYPT_ECCKEY_BLOB; + +typedef struct _BCRYPT_PKCS1_PADDING_INFO +{ + LPCWSTR pszAlgId; +} BCRYPT_PKCS1_PADDING_INFO; + +#define BCRYPT_PAD_NONE 0x00000001 +#define BCRYPT_PAD_PKCS1 0x00000002 +#define BCRYPT_PAD_OAEP 0x00000004 +#define BCRYPT_PAD_PSS 0x00000008 +#define BCRYPT_PAD_PKCS1_OPTIONAL_HASH_OID 0x00000010 + #define BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_VERSION 1 #define BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG 0x00000001 -- 2.16.2

1 0

[v2 PATCH 3/5] bcrypt: Add support for computing/comparing cipher tag.
by Alistair Leslie-Hughes 20 Mar '18

20 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 10 +++++----- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 573cd374a4..a08eb00269 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -50,6 +50,9 @@ static HINSTANCE instance; #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); +/* Not present in gnutls version < 3.0 */ +static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_cipher_decrypt2); @@ -69,6 +72,11 @@ MAKE_FUNCPTR(gnutls_perror); #define GNUTLS_CIPHER_AES_256_GCM 94 #endif +static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void * tag, size_t tag_size) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -102,6 +110,12 @@ static BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_perror) #undef LOAD_FUNCPTR + if (!(pgnutls_cipher_tag = wine_dlsym( libgnutls_handle, "gnutls_cipher_tag", NULL, 0 ))) + { + WARN("gnutls_cipher_tag not found\n"); + pgnutls_cipher_tag = compat_gnutls_cipher_tag; + } + if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) { pgnutls_perror( ret ); @@ -1018,6 +1032,19 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + int ret; + + if ((ret = pgnutls_cipher_tag( key->handle, tag, len ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->handle) pgnutls_cipher_deinit( key->handle ); @@ -1123,6 +1150,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); @@ -1158,6 +1191,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { ERR( "support for keys not available at build time\n" ); @@ -1311,7 +1350,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if ((status = key_encrypt( key, input, input_len, output, output_len ))) return status; - return STATUS_SUCCESS; + return key_get_tag( key, auth_info->pbTag, auth_info->cbTag ); } if ((status = key_set_params( key, iv, iv_len ))) return status; @@ -1370,6 +1409,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (key->mode == MODE_ID_GCM) { BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + UCHAR tag[16]; if (!auth_info) return STATUS_INVALID_PARAMETER; if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; @@ -1387,6 +1427,11 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if ((status = key_decrypt( key, input, input_len, output, output_len ))) return status; + if ((status = key_get_tag( key, tag, sizeof(tag) ))) + return status; + if (memcmp( tag, auth_info->pbTag, auth_info->cbTag )) + return STATUS_AUTH_TAG_MISMATCH; + return STATUS_SUCCESS; } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e3cbc87db4..1176796dbc 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -754,11 +754,11 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == 32, "got %u\n", size); ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); - todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); + ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); + ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); /* input size is not multiple of block size */ size = 0; @@ -769,11 +769,11 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == 24, "got %u\n", size); ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); - todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); + ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 24; i++) ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); + ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); @@ -977,7 +977,7 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); + ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); ok(size == 32, "got %u\n", size); ret = pBCryptDestroyKey(key); -- 2.16.2

1 0

[v2 PATCH 2/5] bcrypt: Implement BCryptDecrypt for AES GCM mode.
by Alistair Leslie-Hughes 20 Mar '18

20 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 28 +++++++++++++++++++++++----- dlls/bcrypt/tests/bcrypt.c | 8 ++++---- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 96695532b5..573cd374a4 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1361,17 +1361,35 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (padding) - { - FIXME( "padding info not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not supported\n", flags ); return STATUS_NOT_IMPLEMENTED; } + if (key->mode == MODE_ID_GCM) + { + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + + if (!auth_info) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; + if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; + + if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + return status; + + *ret_len = input_len; + if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; + if (!output) return STATUS_SUCCESS; + if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + + if ((status = key_decrypt( key, input, input_len, output, output_len ))) + return status; + + return STATUS_SUCCESS; + } + if ((status = key_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1875fb3f89..e3cbc87db4 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -969,16 +969,16 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(plaintext, 0, sizeof(plaintext)); ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); - todo_wine ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); /* test with wrong tag */ memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); + ok(size == 32, "got %u\n", size); ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 2.16.2

1 0

[v2 PATCH 1/5] bcrypt: Implement BCryptEncrypt for AES GCM mode.
by Alistair Leslie-Hughes 20 Mar '18

20 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 59 +++++++++++++++++++++++++++++++++++++++------- dlls/bcrypt/tests/bcrypt.c | 18 +++++++------- 2 files changed, 60 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fa80318f28..96695532b5 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -63,6 +63,12 @@ MAKE_FUNCPTR(gnutls_global_set_log_level); MAKE_FUNCPTR(gnutls_perror); #undef MAKE_FUNCPTR +#if GNUTLS_VERSION_MAJOR < 3 +#define GNUTLS_CIPHER_AES_192_CBC 92 +#define GNUTLS_CIPHER_AES_128_GCM 93 +#define GNUTLS_CIPHER_AES_256_GCM 94 +#endif + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -848,6 +854,7 @@ struct key { struct object hdr; enum alg_id alg_id; + enum mode_id mode; ULONG block_size; gnutls_cipher_hd_t handle; UCHAR *secret; @@ -858,6 +865,7 @@ struct key { struct object hdr; enum alg_id alg_id; + enum mode_id mode; ULONG block_size; CCCryptorRef ref_encrypt; CCCryptorRef ref_decrypt; @@ -868,6 +876,7 @@ struct key struct key { struct object hdr; + enum mode_id mode; ULONG block_size; }; #endif @@ -923,6 +932,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s memcpy( buffer, secret, secret_len ); key->alg_id = alg->id; + key->mode = alg->mode; key->handle = 0; /* initialized on first use */ key->secret = buffer; key->secret_len = secret_len; @@ -935,9 +945,13 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) switch (key->alg_id) { case ALG_ID_AES: - FIXME( "handle block size and chaining mode\n" ); - return GNUTLS_CIPHER_AES_128_CBC; - + WARN( "handle block size\n" ); + switch (key->mode) + { + case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_CBC: + default: return GNUTLS_CIPHER_AES_128_CBC; + } default: FIXME( "algorithm %u not supported\n", key->alg_id ); return GNUTLS_CIPHER_UNKNOWN; @@ -1019,6 +1033,14 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s switch (alg->id) { case ALG_ID_AES: + switch (alg->mode) + { + case MODE_ID_CBC: + break; + default: + FIXME( "mode %u not supported\n", alg->mode ); + return STATUS_NOT_SUPPORTED; + } break; default: @@ -1031,6 +1053,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s memcpy( buffer, secret, secret_len ); key->alg_id = alg->id; + key->mode = alg->mode; key->ref_encrypt = NULL; /* initialized on first use */ key->ref_decrypt = NULL; key->secret = buffer; @@ -1260,17 +1283,37 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (padding) - { - FIXME( "padding info not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not implemented\n", flags ); return STATUS_NOT_IMPLEMENTED; } + if (key->mode == MODE_ID_GCM) + { + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + + if (!auth_info) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; + if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; + if (auth_info->dwFlags & BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG) + FIXME( "call chaining not implemented\n" ); + + if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + return status; + + *ret_len = input_len; + if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; + if (!output) return STATUS_SUCCESS; + if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + + if ((status = key_encrypt( key, input, input_len, output, output_len ))) + return status; + + return STATUS_SUCCESS; + } + if ((status = key_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index ba2011f5df..1875fb3f89 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -751,12 +751,12 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); - todo_wine ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) - todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); @@ -766,12 +766,12 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = pBCryptEncrypt(key, data2, 24, &auth_info, ivbuf, 16, ciphertext, 24, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 24, "got %u\n", size); - todo_wine ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 24, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 24; i++) - todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); @@ -784,7 +784,7 @@ static void test_BCryptEncrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); - todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 2.16.2

1 0

[PATCH 5/5] bcrypt: Allow to call BCryptSetProperty on key objects.
by Alistair Leslie-Hughes 20 Mar '18

20 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/bcrypt/tests/bcrypt.c | 4 ++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 5daddff..f26903f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -246,6 +246,9 @@ struct algorithm BOOL hmac; }; +struct key; +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ); + NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG count, ULONG flags) { const DWORD supported_flags = BCRYPT_USE_SYSTEM_PREFERRED_RNG; @@ -696,8 +699,8 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA } case MAGIC_KEY: { - FIXME( "keys not implemented yet\n" ); - return STATUS_NOT_IMPLEMENTED; + struct key *key = (struct key *)object; + return set_key_property( key, prop, value, size, flags ); } default: WARN( "unknown magic %08x\n", object->magic ); @@ -954,6 +957,31 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_SUCCESS; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + { + key->mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) + { + key->mode = MODE_ID_GCM; + return STATUS_SUCCESS; + } + else + { + FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + return STATUS_NOT_IMPLEMENTED; + } + } + + FIXME( "unsupported key property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { switch (key->alg_id) @@ -1089,6 +1117,12 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_SUCCESS; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { CCCryptorStatus status; @@ -1172,6 +1206,12 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { ERR( "support for keys not available at build time\n" ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1176796..9922e41 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -525,6 +525,10 @@ static void test_BCryptGenerateSymmetricKey(void) sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = pBCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, + sizeof(BCRYPT_CHAIN_MODE_CBC), 0); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret); + size = 0xdeadbeef; ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 1.9.1

2 1

[PATCH 4/5] include: Add ecdsa and asymmetric key related bcrypt definitions.
by Alistair Leslie-Hughes 20 Mar '18

20 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/bcrypt.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index d0b29c7..717d77c 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -61,6 +61,8 @@ typedef LONG NTSTATUS; #define BCRYPT_OPAQUE_KEY_BLOB (const WCHAR []){'O','p','a','q','u','e','K','e','y','B','l','o','b',0} #define BCRYPT_KEY_DATA_BLOB (const WCHAR []){'K','e','y','D','a','t','a','B','l','o','b',0} #define BCRYPT_AES_WRAP_KEY_BLOB (const WCHAR []){'R','f','c','3','5','6','5','K','e','y','W','r','a','p','B','l','o','b',0} +#define BCRYPT_ECCPUBLIC_BLOB (const WCHAR []){'E','C','C','P','U','B','L','I','C','B','L','O','B',0} +#define BCRYPT_ECCPRIVATE_BLOB (const WCHAR []){'E','C','C','P','R','I','V','A','T','E','B','L','O','B',0} #define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} @@ -76,6 +78,9 @@ typedef LONG NTSTATUS; #define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} #define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} #define BCRYPT_SHA512_ALGORITHM (const WCHAR []){'S','H','A','5','1','2',0} +#define BCRYPT_ECDSA_P256_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','2','5','6',0} +#define BCRYPT_ECDSA_P384_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','3','8','4',0} +#define BCRYPT_ECDSA_P521_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','5','2','1',0} #define BCRYPT_CHAIN_MODE_NA (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','N','/','A',0} #define BCRYPT_CHAIN_MODE_CBC (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','B','C',0} @@ -84,6 +89,13 @@ typedef LONG NTSTATUS; #define BCRYPT_CHAIN_MODE_CCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','C','M',0} #define BCRYPT_CHAIN_MODE_GCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0} +#define BCRYPT_ECDSA_PUBLIC_P256_MAGIC 0x31534345 +#define BCRYPT_ECDSA_PRIVATE_P256_MAGIC 0x32534345 +#define BCRYPT_ECDSA_PUBLIC_P384_MAGIC 0x33534345 +#define BCRYPT_ECDSA_PRIVATE_P384_MAGIC 0x34534345 +#define BCRYPT_ECDSA_PUBLIC_P521_MAGIC 0x35534345 +#define BCRYPT_ECDSA_PRIVATE_P521_MAGIC 0x36534345 + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName; @@ -115,6 +127,23 @@ typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO ULONG dwFlags; } BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO, *PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO; +typedef struct _BCRYPT_ECCKEY_BLOB +{ + ULONG dwMagic; + ULONG cbKey; +} BCRYPT_ECCKEY_BLOB, *PBCRYPT_ECCKEY_BLOB; + +typedef struct _BCRYPT_PKCS1_PADDING_INFO +{ + LPCWSTR pszAlgId; +} BCRYPT_PKCS1_PADDING_INFO; + +#define BCRYPT_PAD_NONE 0x00000001 +#define BCRYPT_PAD_PKCS1 0x00000002 +#define BCRYPT_PAD_OAEP 0x00000004 +#define BCRYPT_PAD_PSS 0x00000008 +#define BCRYPT_PAD_PKCS1_OPTIONAL_HASH_OID 0x00000010 + #define BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_VERSION 1 #define BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG 0x00000001 -- 1.9.1

2 1

[PATCH 3/5] bcrypt: Add support for computing/comparing cipher tag.
by Alistair Leslie-Hughes 20 Mar '18

20 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 10 +++++----- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 02a0106..5daddff 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -50,6 +50,9 @@ static HINSTANCE instance; #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); +/* Not present in gnutls version < 3.0 */ +static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_cipher_decrypt2); @@ -69,6 +72,11 @@ MAKE_FUNCPTR(gnutls_perror); #define GNUTLS_CIPHER_AES_256_GCM 94 #endif +static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void * tag, size_t tag_size) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -102,6 +110,12 @@ static BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_perror) #undef LOAD_FUNCPTR + if (!(pgnutls_cipher_tag = wine_dlsym( libgnutls_handle, "gnutls_cipher_tag", NULL, 0 ))) + { + WARN("gnutls_cipher_tag not found\n"); + pgnutls_cipher_tag = compat_gnutls_cipher_tag; + } + if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) { pgnutls_perror( ret ); @@ -1018,6 +1032,19 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + int ret; + + if ((ret = pgnutls_cipher_tag( key->handle, tag, len ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->handle) pgnutls_cipher_deinit( key->handle ); @@ -1123,6 +1150,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); @@ -1159,6 +1192,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { ERR( "support for keys not available at build time\n" ); @@ -1312,7 +1351,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if ((status = key_encrypt( key, input, input_len, output, output_len ))) return status; - return STATUS_SUCCESS; + return key_get_tag( key, auth_info->pbTag, auth_info->cbTag ); } if ((status = key_set_params( key, iv, iv_len ))) return status; @@ -1371,6 +1410,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (key->mode == MODE_ID_GCM) { BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + UCHAR tag[16]; if (!auth_info) return STATUS_INVALID_PARAMETER; if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; @@ -1388,6 +1428,11 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if ((status = key_decrypt( key, input, input_len, output, output_len ))) return status; + if ((status = key_get_tag( key, tag, sizeof(tag) ))) + return status; + if (memcmp( tag, auth_info->pbTag, auth_info->cbTag )) + return STATUS_AUTH_TAG_MISMATCH; + return STATUS_SUCCESS; } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e3cbc87..1176796 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -754,11 +754,11 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == 32, "got %u\n", size); ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); - todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); + ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); + ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); /* input size is not multiple of block size */ size = 0; @@ -769,11 +769,11 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == 24, "got %u\n", size); ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); - todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); + ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 24; i++) ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); + ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); @@ -977,7 +977,7 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); + ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); ok(size == 32, "got %u\n", size); ret = pBCryptDestroyKey(key); -- 1.9.1

2 1

[PATCH 2/5] bcrypt: Implement BCryptDecrypt for AES GCM mode.
by Alistair Leslie-Hughes 20 Mar '18

20 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 28 +++++++++++++++++++++++----- dlls/bcrypt/tests/bcrypt.c | 8 ++++---- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index dfdb7b2..02a0106 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1362,17 +1362,35 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (padding) - { - FIXME( "padding info not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not supported\n", flags ); return STATUS_NOT_IMPLEMENTED; } + if (key->mode == MODE_ID_GCM) + { + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + + if (!auth_info) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; + if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; + + if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + return status; + + *ret_len = input_len; + if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; + if (!output) return STATUS_SUCCESS; + if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + + if ((status = key_decrypt( key, input, input_len, output, output_len ))) + return status; + + return STATUS_SUCCESS; + } + if ((status = key_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1875fb3..e3cbc87 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -969,16 +969,16 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(plaintext, 0, sizeof(plaintext)); ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); - todo_wine ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); /* test with wrong tag */ memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); + ok(size == 32, "got %u\n", size); ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 1.9.1

2 1

[PATCH 1/5] bcrypt: Implement BCryptEncrypt for AES GCM mode.
by Alistair Leslie-Hughes 20 Mar '18

20 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 60 +++++++++++++++++++++++++++++++++++++++------- dlls/bcrypt/tests/bcrypt.c | 18 +++++++------- 2 files changed, 61 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fa80318..dfdb7b2 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -63,6 +63,12 @@ MAKE_FUNCPTR(gnutls_global_set_log_level); MAKE_FUNCPTR(gnutls_perror); #undef MAKE_FUNCPTR +#if GNUTLS_VERSION_MAJOR < 3 +#define GNUTLS_CIPHER_AES_192_CBC 92 +#define GNUTLS_CIPHER_AES_128_GCM 93 +#define GNUTLS_CIPHER_AES_256_GCM 94 +#endif + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -848,6 +854,7 @@ struct key { struct object hdr; enum alg_id alg_id; + enum mode_id mode; ULONG block_size; gnutls_cipher_hd_t handle; UCHAR *secret; @@ -858,6 +865,7 @@ struct key { struct object hdr; enum alg_id alg_id; + enum mode_id mode; ULONG block_size; CCCryptorRef ref_encrypt; CCCryptorRef ref_decrypt; @@ -868,6 +876,7 @@ struct key struct key { struct object hdr; + enum mode_id mode; ULONG block_size; }; #endif @@ -923,6 +932,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s memcpy( buffer, secret, secret_len ); key->alg_id = alg->id; + key->mode = alg->mode; key->handle = 0; /* initialized on first use */ key->secret = buffer; key->secret_len = secret_len; @@ -935,9 +945,13 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) switch (key->alg_id) { case ALG_ID_AES: - FIXME( "handle block size and chaining mode\n" ); - return GNUTLS_CIPHER_AES_128_CBC; - + WARN( "handle block size\n" ); + switch (key->mode) + { + case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_CBC: + default: return GNUTLS_CIPHER_AES_128_CBC; + } default: FIXME( "algorithm %u not supported\n", key->alg_id ); return GNUTLS_CIPHER_UNKNOWN; @@ -1019,6 +1033,14 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s switch (alg->id) { case ALG_ID_AES: + switch (alg->mode) + { + case MODE_ID_CBC: + break; + default: + FIXME( "mode %u not supported\n", alg->mode ); + return STATUS_NOT_SUPPORTED; + } break; default: @@ -1031,6 +1053,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s memcpy( buffer, secret, secret_len ); key->alg_id = alg->id; + key->mode = alg->mode; key->ref_encrypt = NULL; /* initialized on first use */ key->ref_decrypt = NULL; key->secret = buffer; @@ -1112,6 +1135,7 @@ static NTSTATUS key_destroy( struct key *key ) static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { ERR( "support for keys not available at build time\n" ); + key->mode = MODE_ID_CBC; return STATUS_NOT_IMPLEMENTED; } @@ -1260,17 +1284,37 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (padding) - { - FIXME( "padding info not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not implemented\n", flags ); return STATUS_NOT_IMPLEMENTED; } + if (key->mode == MODE_ID_GCM) + { + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + + if (!auth_info) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; + if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; + if (auth_info->dwFlags & BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG) + FIXME( "call chaining not implemented\n" ); + + if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + return status; + + *ret_len = input_len; + if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; + if (!output) return STATUS_SUCCESS; + if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + + if ((status = key_encrypt( key, input, input_len, output, output_len ))) + return status; + + return STATUS_SUCCESS; + } + if ((status = key_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index ba2011f..1875fb3 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -751,12 +751,12 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); - todo_wine ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) - todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); @@ -766,12 +766,12 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = pBCryptEncrypt(key, data2, 24, &auth_info, ivbuf, 16, ciphertext, 24, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 24, "got %u\n", size); - todo_wine ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 24, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 24; i++) - todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); @@ -784,7 +784,7 @@ static void test_BCryptEncrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); - todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 1.9.1

2 1

[PATCH 8/8] [v3] wsdapi: Store discovered namespaces and write xmlns attributes for them.
by Owen Rudge 20 Mar '18

20 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 67 +++++++++++++++++++++++++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 8 ++++-- dlls/wsdapi/wsdapi_internal.h | 4 +++ dlls/wsdapi/xml.c | 2 +- 4 files changed, 74 insertions(+), 7 deletions(-)

2 1

[PATCH 7/8] [v3] wsdapi: Implement generation of SOAP header.
by Owen Rudge 20 Mar '18

20 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-)

2 1

[PATCH 6/8] [v3] wsdapi: Implement writing of XML elements.
by Owen Rudge 20 Mar '18

20 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-)

2 1

[PATCH 5/8] [v3] wsdapi: Implement generation of XML from WSDXML structures.
by Owen Rudge 20 Mar '18

20 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/Makefile.in | 2 +- dlls/wsdapi/soap.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 177 insertions(+), 8 deletions(-)

2 1

[PATCH 4/8] [v3] wsdapi: Populate SOAP header structure.
by Owen Rudge 20 Mar '18

20 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-)

2 1

[PATCH 3/8] [v3] wsdapi: Add support for sending messages via UDP multicast.
by Owen Rudge 20 Mar '18

20 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/Makefile.in | 3 +- dlls/wsdapi/discovery.c | 5 + dlls/wsdapi/network.c | 259 ++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/soap.c | 17 ++- dlls/wsdapi/tests/discovery.c | 4 +- dlls/wsdapi/wsdapi_internal.h | 6 + 6 files changed, 289 insertions(+), 5 deletions(-) create mode 100644 dlls/wsdapi/network.c

2 1

[PATCH 2/8] [v3] wsdapi: Add stub implementation of IWSDiscoveryPublisher_PublishEx.
by Owen Rudge 20 Mar '18

20 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/Makefile.in | 1 + dlls/wsdapi/discovery.c | 40 +++++++++----------------- dlls/wsdapi/soap.c | 66 +++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi_internal.h | 24 ++++++++++++++++ 4 files changed, 105 insertions(+), 26 deletions(-) create mode 100644 dlls/wsdapi/soap.c

2 1

[PATCH 1/8] [v3] wsdapi: Add wsdapi_internal.h for shared internal function and macro definitions.
by Owen Rudge 20 Mar '18

20 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/address.c | 6 +----- dlls/wsdapi/wsdapi_internal.h | 35 +++++++++++++++++++++++++++++++++++ dlls/wsdapi/xml.c | 7 +------ 3 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 dlls/wsdapi/wsdapi_internal.h

2 1

[PATCH v4] iphlpapi: Add support for ConvertLengthToIpv4Mask()
by Dagfinn Reiakvam 20 Mar '18

20 Mar '18

This patch fixes bug: https://bugs.winehq.org/show_bug.cgi?id=44742 Signed-off-by: Dagfinn Reiakvam <dagfinn(a)reiakvam.no> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 19 +++++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 36 ++++++++++++++++++++++++++++++++++++ include/netioapi.h | 1 + 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index b6c9aef..bbd1ed8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -23,7 +23,7 @@ @ stdcall ConvertInterfaceNameToLuidW( wstr ptr ) #@ stub ConvertInterfacePhysicalAddressToLuid #@ stub ConvertIpv4MaskToLength -#@ stub ConvertLengthToIpv4Mask +@ stdcall ConvertLengthToIpv4Mask( long ptr ) #@ stub ConvertRemoteInterfaceAliasToLuid #@ stub ConvertRemoteInterfaceGuidToLuid #@ stub ConvertRemoteInterfaceIndexToLuid diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 97284ed..604470a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,6 +3223,25 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) } /****************************************************************** + * ConvertLengthToIpv4Mask (IPHLPAPI.@) + */ +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG mask_len, ULONG *mask) +{ + if (mask_len > 32) + { + *mask = INADDR_NONE; + return ERROR_INVALID_PARAMETER; + } + + if (mask_len == 0) + *mask = 0; + else + *mask = htonl(~0u << (32 - mask_len)); + + return NO_ERROR; +} + +/****************************************************************** * if_nametoindex (IPHLPAPI.@) */ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 873612d..518366b 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -96,6 +96,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameW)(const NET_LUID*,WCHAR*,SIZE_ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T); static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*); static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); @@ -149,6 +150,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask"); pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } @@ -2174,6 +2176,39 @@ static void test_GetUnicastIpAddressTable(void) pFreeMibTable(table); } +static void test_ConvertLengthToIpv4Mask(void) +{ + DWORD apiReturn; + DWORD n; + ULONG mask; + ULONG expected; + + if (!pConvertLengthToIpv4Mask) + { + win_skip( "ConvertLengthToIpv4Mask not available\n" ); + return; + } + + for (n=0; n <= 32; n++) + { + mask = 0xdeadbeef; + if (n>0) + expected = htonl( ~0u << (32 - n) ); + else + expected = 0; + + apiReturn = pConvertLengthToIpv4Mask( n, &mask ); + ok( apiReturn == NO_ERROR, "ConvertLengthToIpv4Mask returned 0x%08x, expected 0x%08x\n", apiReturn, NO_ERROR ); + ok( mask == expected, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, expected ); + } + + /* Testing for out of range. In this case both mask and return are changed to indicate error. */ + mask = 0xdeadbeef; + apiReturn = pConvertLengthToIpv4Mask( 33, &mask ); + ok( apiReturn == ERROR_INVALID_PARAMETER, "ConvertLengthToIpv4Mask returned 0x%08x, expected 0x%08x\n", apiReturn, ERROR_INVALID_PARAMETER ); + ok( mask == INADDR_NONE, "ConvertLengthToIpv4Mask mask value 0x%.8x, expected 0x%08x\n", mask, INADDR_NONE ); +} + START_TEST(iphlpapi) { @@ -2201,6 +2236,7 @@ START_TEST(iphlpapi) test_GetIfTable2Ex(); test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); + test_ConvertLengthToIpv4Mask(); freeIPHlpApi(); } } diff --git a/include/netioapi.h b/include/netioapi.h index 1095888..4bd64e8 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -170,6 +170,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID*,char*,SIZE_T); DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID*,WCHAR*,SIZE_T); DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); -- 2.7.4

2 1

[PATCH] user32: Add redirected class registration callback
by Nikolay Sivov 20 Mar '18

20 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makes Visio 2003 dialogs appear again, see https://bugs.winehq.org/show_bug.cgi?id=44677. Context is activated dynamically, simply loading the module won't trigger class registration in that case because it's already loaded by that time. dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/commctrl.c | 42 ++++++++++++++++++++++++++++++------ dlls/user32/class.c | 52 ++++++++++++++++++++++++++++++++++++--------- dlls/user32/user_private.h | 3 ++- dlls/user32/win.c | 2 +- 5 files changed, 81 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 4e1aeadf1d..34d9e7650d 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -194,5 +194,6 @@ @ stdcall PropertySheet(ptr) PropertySheetA @ stdcall PropertySheetA(ptr) @ stdcall PropertySheetW(ptr) +@ stdcall RegisterClassNameW(wstr) @ stdcall UninitializeFlatSB(long) @ stdcall _TrackMouseEvent(ptr) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 9356624a13..1117ec43e9 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -69,6 +69,7 @@ #include "shlwapi.h" #include "comctl32.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(commctrl); @@ -113,6 +114,40 @@ static void unregister_versioned_classes(void) #undef VERSION } +BOOL WINAPI RegisterClassNameW(const WCHAR *class) +{ + static const struct + { + const WCHAR nameW[16]; + void (*fn_register)(void); + } + classes[] = + { + { {'B','u','t','t','o','n',0}, BUTTON_Register }, + { {'C','o','m','b','o','B','o','x',0}, COMBO_Register }, + { {'C','o','m','b','o','L','B','o','x',0}, COMBOLBOX_Register }, + { {'E','d','i','t',0}, EDIT_Register }, + { {'L','i','s','t','B','o','x',0}, LISTBOX_Register }, + { {'S','t','a','t','i','c',0}, STATIC_Register }, + }; + + int min = 0, max = ARRAY_SIZE(classes) - 1; + + while (min <= max) + { + int res, pos = (min + max) / 2; + if (!(res = strcmpiW(class, classes[pos].nameW))) + { + classes[pos].fn_register(); + return TRUE; + } + if (res < 0) max = pos - 1; + else min = pos + 1; + } + + return FALSE; +} + /*********************************************************************** * DllMain [Internal] * @@ -172,13 +207,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) TREEVIEW_Register (); UPDOWN_Register (); - BUTTON_Register (); - COMBO_Register (); - COMBOLBOX_Register (); - EDIT_Register (); - LISTBOX_Register (); - STATIC_Register (); - /* subclass user32 controls */ THEMING_Initialize (); break; diff --git a/dlls/user32/class.c b/dlls/user32/class.c index e733cc2ce2..a8b5a8fe5c 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -332,7 +332,8 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) ULONG module_len; ULONG module_offset; } *wndclass; - const WCHAR *module; + const WCHAR *module, *ret; + HMODULE hmod; if (basename_offset) *basename_offset = 0; @@ -352,10 +353,42 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); - if (!GetModuleHandleW( module )) - LoadLibraryW( module ); + if (!(hmod = GetModuleHandleW( module ))) + hmod = LoadLibraryW( module ); - return (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); + ret = (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); + + if (register_class && hmod) + { + BOOL found = FALSE; + struct list *ptr; + + USER_Lock(); + + LIST_FOR_EACH( ptr, &class_list ) + { + CLASS *class = LIST_ENTRY( ptr, CLASS, entry ); + if (strcmpiW( class->name, ret )) continue; + if (!class->local || class->hInstance == hmod) + { + found = TRUE; + break; + } + } + + USER_Unlock(); + + if (!found) + { + BOOL (WINAPI *pRegisterClassNameW)(const WCHAR *class); + + pRegisterClassNameW = (void *)GetProcAddress(hmod, "RegisterClassNameW"); + if (pRegisterClassNameW) + pRegisterClassNameW(name); + } + } + + return ret; } /*********************************************************************** @@ -373,7 +406,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name, NULL ); + name = CLASS_GetVersionedName( name, NULL, TRUE ); for (;;) { @@ -409,7 +442,6 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) return NULL; } - /*********************************************************************** * CLASS_RegisterClass * @@ -646,7 +678,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name, &basename_offset ); + classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -700,7 +732,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset ); + classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -753,7 +785,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className, NULL ); + className = CLASS_GetVersionedName( className, NULL, FALSE ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f1cc0a8791..7e4f699b25 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -269,7 +269,8 @@ extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM w extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; -extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset) DECLSPEC_HIDDEN; +extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, + BOOL register_class) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8c89768ef4..3c497f878e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1344,7 +1344,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL); + className = CLASS_GetVersionedName(className, NULL, TRUE); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), -- 2.16.2

1 0

[PATCH 1/5] comdlg32: Use memory allocation helpers
by Nikolay Sivov 20 Mar '18

20 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comdlg32/cdlg32.c | 22 ++++---- dlls/comdlg32/colordlg.c | 17 +++--- dlls/comdlg32/filedlg.c | 140 ++++++++++++++++++++-------------------------- dlls/comdlg32/filedlg31.c | 55 +++++++++--------- dlls/comdlg32/finddlg.c | 5 +- dlls/comdlg32/fontdlg.c | 13 +++-- 6 files changed, 122 insertions(+), 130 deletions(-) diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index e794f94d8b..a00da2dda7 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -32,6 +32,7 @@ #include "commdlg.h" #include "cderr.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(commdlg); @@ -128,16 +129,17 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) * Success: Pointer to a heap block * Failure: null */ -LPVOID COMDLG32_AllocMem( - int size /* [in] Block size to allocate */ -) { - LPVOID ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if(!ptr) - { - COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); - return NULL; - } - return ptr; +void *COMDLG32_AllocMem(int size) +{ + void *ptr = heap_alloc_zero(size); + + if (!ptr) + { + COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); + return NULL; + } + + return ptr; } diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index bead9ba38c..a717e847c7 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -31,10 +31,12 @@ #include "winuser.h" #include "commdlg.h" #include "dlgs.h" -#include "wine/debug.h" #include "cderr.h" #include "cdlg.h" +#include "wine/debug.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(commdlg); static INT_PTR CALLBACK ColorDlgProc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ); @@ -858,7 +860,7 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) return FALSE; } - lpp = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct CCPRIVATE) ); + lpp = heap_alloc_zero(sizeof(*lpp)); lpp->lpcc = cc; lpp->hwndSelf = hDlg; @@ -1215,7 +1217,7 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message, case WM_NCDESTROY: DeleteDC(lpp->hdcMem); DeleteObject(lpp->hbmMem); - HeapFree(GetProcessHeap(), 0, lpp); + heap_free(lpp); RemovePropW( hDlg, szColourDialogProp ); break; case WM_COMMAND: @@ -1326,7 +1328,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol ) LPWSTR template_name = NULL; BOOL ret; - LPCHOOSECOLORW lpcc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHOOSECOLORW)); + CHOOSECOLORW *lpcc = heap_alloc_zero(sizeof(*lpcc)); lpcc->lStructSize = sizeof(*lpcc); lpcc->hwndOwner = lpChCol->hwndOwner; lpcc->hInstance = lpChCol->hInstance; @@ -1338,7 +1340,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol ) if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) { if (!IS_INTRESOURCE(lpChCol->lpTemplateName)) { INT len = MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, NULL, 0); - template_name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + template_name = heap_alloc( len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, template_name, len ); lpcc->lpTemplateName = template_name; } else { @@ -1350,7 +1352,8 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol ) if (ret) lpChCol->rgbResult = lpcc->rgbResult; - HeapFree(GetProcessHeap(), 0, template_name); - HeapFree(GetProcessHeap(), 0, lpcc); + + heap_free(template_name); + heap_free(lpcc); return ret; } diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 8d989bc6f6..fa9ecfbd4f 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -75,6 +75,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(commdlg); @@ -236,10 +237,6 @@ static BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl); static UINT GetNumSelected( IDataObject *doSelected ); static void COMCTL32_ReleaseStgMedium(STGMEDIUM medium); -/* Shell memory allocation */ -static void *MemAlloc(UINT size); -static void MemFree(void *mem); - static INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCount, UINT sizeUsed); @@ -349,7 +346,7 @@ static WCHAR *heap_strdupAtoW(const char *str) return NULL; len = MultiByteToWideChar(CP_ACP, 0, str, -1, 0, 0); - ret = MemAlloc(len * sizeof(WCHAR)); + ret = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); return ret; @@ -379,7 +376,7 @@ static void init_filedlg_infoW(OPENFILENAMEW *ofn, FileOpenDlgInfos *info) if (ofn->lpstrFile) { - info->filename = MemAlloc(ofn->nMaxFile * sizeof(WCHAR)); + info->filename = heap_alloc(ofn->nMaxFile * sizeof(WCHAR)); lstrcpynW(info->filename, ofn->lpstrFile, ofn->nMaxFile); } @@ -388,7 +385,7 @@ static void init_filedlg_infoW(OPENFILENAMEW *ofn, FileOpenDlgInfos *info) DWORD len = ExpandEnvironmentStringsW(ofn->lpstrInitialDir, NULL, 0); if (len) { - info->initdir = MemAlloc(len * sizeof(WCHAR)); + info->initdir = heap_alloc(len * sizeof(WCHAR)); ExpandEnvironmentStringsW(ofn->lpstrInitialDir, info->initdir, len); } } @@ -410,7 +407,7 @@ static void init_filedlg_infoA(OPENFILENAMEA *ofn, FileOpenDlgInfos *info) if (ofn->lpstrFile) { len = MultiByteToWideChar(CP_ACP, 0, ofn->lpstrFile, ofn->nMaxFile, NULL, 0); - ofnW.lpstrFile = MemAlloc(len * sizeof(WCHAR)); + ofnW.lpstrFile = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, ofn->lpstrFile, ofn->nMaxFile, ofnW.lpstrFile, len); ofnW.nMaxFile = len; } @@ -426,7 +423,7 @@ static void init_filedlg_infoA(OPENFILENAMEA *ofn, FileOpenDlgInfos *info) s++; n = s - ofn->lpstrFilter; len = MultiByteToWideChar(CP_ACP, 0, ofn->lpstrFilter, n, NULL, 0); - ofnW.lpstrFilter = MemAlloc(len * sizeof(WCHAR)); + ofnW.lpstrFilter = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, ofn->lpstrFilter, n, (WCHAR *)ofnW.lpstrFilter, len); } @@ -442,7 +439,7 @@ static void init_filedlg_infoA(OPENFILENAMEA *ofn, FileOpenDlgInfos *info) if (*s) s = s+strlen(s)+1; n = s - ofn->lpstrCustomFilter; len = MultiByteToWideChar(CP_ACP, 0, ofn->lpstrCustomFilter, n, NULL, 0); - ofnW.lpstrCustomFilter = MemAlloc(len * sizeof(WCHAR)); + ofnW.lpstrCustomFilter = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, ofn->lpstrCustomFilter, n, ofnW.lpstrCustomFilter, len); } @@ -453,8 +450,8 @@ static void init_filedlg_infoA(OPENFILENAMEA *ofn, FileOpenDlgInfos *info) info->unicode = FALSE; /* free what was duplicated */ - MemFree((WCHAR *)ofnW.lpstrInitialDir); - MemFree((WCHAR *)ofnW.lpstrFile); + heap_free((void *)ofnW.lpstrInitialDir); + heap_free(ofnW.lpstrFile); } /*********************************************************************** @@ -470,7 +467,7 @@ static BOOL GetFileDialog95(FileOpenDlgInfos *info, UINT dlg_type) /* save current directory */ if (info->ofnInfos->Flags & OFN_NOCHANGEDIR) { - current_dir = MemAlloc(MAX_PATH * sizeof(WCHAR)); + current_dir = heap_alloc(MAX_PATH * sizeof(WCHAR)); GetCurrentDirectoryW(MAX_PATH, current_dir); } @@ -490,19 +487,19 @@ static BOOL GetFileDialog95(FileOpenDlgInfos *info, UINT dlg_type) if (current_dir) { SetCurrentDirectoryW(current_dir); - MemFree(current_dir); + heap_free(current_dir); } if (!info->unicode) { - MemFree((WCHAR *)info->defext); - MemFree((WCHAR *)info->title); - MemFree((WCHAR *)info->filter); - MemFree((WCHAR *)info->customfilter); + heap_free((void *)info->defext); + heap_free((void *)info->title); + heap_free((void *)info->filter); + heap_free((void *)info->customfilter); } - MemFree(info->filename); - MemFree(info->initdir); + heap_free(info->filename); + heap_free(info->initdir); return ret; } @@ -580,7 +577,7 @@ int COMDLG32_SplitFileNames(LPWSTR lpstrEdit, UINT nStrLen, LPWSTR *lpstrFileLis /* we might get single filename without any '"', * so we need nStrLen + terminating \0 + end-of-list \0 */ - *lpstrFileList = MemAlloc( (nStrLen+2)*sizeof(WCHAR) ); + *lpstrFileList = heap_alloc((nStrLen + 2) * sizeof(WCHAR)); *sizeUsed = 0; /* build delimited file list from filenames */ @@ -908,7 +905,7 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID result /* get path and filenames */ len = SendMessageW( fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0 ); - buffer = HeapAlloc( GetProcessHeap(), 0, (len + 2 + MAX_PATH) * sizeof(WCHAR) ); + buffer = heap_alloc( (len + 2 + MAX_PATH) * sizeof(WCHAR) ); COMDLG32_GetDisplayNameOf( fodInfos->ShellInfos.pidlAbsCurrent, buffer ); if (len) { @@ -928,7 +925,7 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID result if (total <= size) WideCharToMultiByte( CP_ACP, 0, buffer, -1, result, size, NULL, NULL ); TRACE( "CDM_GETFILEPATH: returning %u %s\n", total, debugstr_a(result)); } - HeapFree( GetProcessHeap(), 0, buffer ); + heap_free( buffer ); return total; } @@ -1589,8 +1586,8 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) else *fodInfos->filename = '\0'; - MemFree(fodInfos->initdir); - fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf) + 1)*sizeof(WCHAR)); + heap_free(fodInfos->initdir); + fodInfos->initdir = heap_alloc((lstrlenW(tmpBuf) + 1)*sizeof(WCHAR)); lstrcpyW(fodInfos->initdir, tmpBuf); handledPath = TRUE; TRACE("Value in Filename includes path, overriding InitialDir: %s, %s\n", @@ -1624,8 +1621,8 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit); if (result) { *nameBit = 0x00; - MemFree(fodInfos->initdir); - fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf2) + 1) * sizeof(WCHAR)); + heap_free(fodInfos->initdir); + fodInfos->initdir = heap_alloc((lstrlenW(tmpBuf2) + 1) * sizeof(WCHAR)); lstrcpyW(fodInfos->initdir, tmpBuf2); handledPath = TRUE; TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir)); @@ -1633,7 +1630,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } else if (fodInfos->initdir) { - MemFree(fodInfos->initdir); + heap_free(fodInfos->initdir); fodInfos->initdir = NULL; TRACE("Value in InitDir is not an existing path, changed to (nil)\n"); } @@ -1659,8 +1656,8 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) *nameBit = 0x00; len = lstrlenW(tmpBuf); - MemFree(fodInfos->initdir); - fodInfos->initdir = MemAlloc((len+1)*sizeof(WCHAR)); + heap_free(fodInfos->initdir); + fodInfos->initdir = heap_alloc((len+1)*sizeof(WCHAR)); lstrcpyW(fodInfos->initdir, tmpBuf); handledPath = TRUE; @@ -1672,7 +1669,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* 4. Win2000+: Recently used */ if (!handledPath && win2000plus) { - fodInfos->initdir = MemAlloc(MAX_PATH * sizeof(WCHAR)); + fodInfos->initdir = heap_alloc(MAX_PATH * sizeof(WCHAR)); fodInfos->initdir[0] = '\0'; FILEDLG95_MRU_load_filename(fodInfos->initdir); @@ -1680,7 +1677,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) if (fodInfos->initdir[0] && PathFileExistsW(fodInfos->initdir)){ handledPath = TRUE; }else{ - MemFree(fodInfos->initdir); + heap_free(fodInfos->initdir); fodInfos->initdir = NULL; } } @@ -1712,8 +1709,8 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } else { - MemFree(fodInfos->initdir); - fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR)); + heap_free(fodInfos->initdir); + fodInfos->initdir = heap_alloc(MAX_PATH * sizeof(WCHAR)); GetCurrentDirectoryW(MAX_PATH, fodInfos->initdir); handledPath = TRUE; @@ -1727,7 +1724,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* 6. Win98+ and 2000+: Use personal files dir, others use current dir */ if (!handledPath && (win2000plus || win98plus)) { - fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR)); + fodInfos->initdir = heap_alloc(MAX_PATH * sizeof(WCHAR)); if(!COMDLG32_SHGetFolderPathW(hwnd, CSIDL_PERSONAL, 0, 0, fodInfos->initdir)) { @@ -1744,7 +1741,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } handledPath = TRUE; } else if (!handledPath) { - fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR)); + fodInfos->initdir = heap_alloc(MAX_PATH * sizeof(WCHAR)); GetCurrentDirectoryW(MAX_PATH, fodInfos->initdir); handledPath = TRUE; TRACE("No initial dir specified, using current dir of %s\n", debugstr_w(fodInfos->initdir)); @@ -2264,7 +2261,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename) final_len = path_len + lstrlenW(module_name) + 2; - final = MemAlloc(final_len * sizeof(WCHAR)); + final = heap_alloc(final_len * sizeof(WCHAR)); if(!final) return; lstrcpyW(final, module_name); @@ -2275,12 +2272,12 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename) final_len * sizeof(WCHAR)); if(ret){ WARN("Error saving MRU data to slot %s: %d\n", wine_dbgstr_w(slot_name), ret); - MemFree(final); + heap_free(final); RegCloseKey(hkey); return; } - MemFree(final); + heap_free(final); } { /* update MRUList value */ @@ -2517,7 +2514,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) */ COMDLG32_GetCanonicalPath(fodInfos->ShellInfos.pidlAbsCurrent, lpstrFileList, lpstrPathAndFile); - MemFree(lpstrFileList); + heap_free(lpstrFileList); /* Step 2: here we have a cleaned up path @@ -2564,9 +2561,9 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) DWORD len; /* replace the current filter */ - MemFree(fodInfos->ShellInfos.lpstrCurrentFilter); + heap_free(fodInfos->ShellInfos.lpstrCurrentFilter); len = lstrlenW(lpszTemp)+1; - fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc(len * sizeof(WCHAR)); + fodInfos->ShellInfos.lpstrCurrentFilter = heap_alloc(len * sizeof(WCHAR)); lstrcpyW( fodInfos->ShellInfos.lpstrCurrentFilter, lpszTemp); /* set the filter cb to the extension when possible */ @@ -2641,7 +2638,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) if (lpstrFilter != (LPWSTR)CB_ERR) /* control is not empty */ { WCHAR* filterSearchIndex; - filterExt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(lpstrFilter) + 1) * sizeof(WCHAR)); + filterExt = heap_alloc((lstrlenW(lpstrFilter) + 1) * sizeof(WCHAR)); strcpyW(filterExt, lpstrFilter); /* if a semicolon-separated list of file extensions was given, do not include the @@ -2663,7 +2660,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) } else { - HeapFree(GetProcessHeap(), 0, filterExt); + heap_free(filterExt); filterExt = NULL; } } @@ -2671,7 +2668,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) if (!filterExt) { /* use the default file extension */ - filterExt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fodInfos->defext) + 1) * sizeof(WCHAR)); + filterExt = heap_alloc((lstrlenW(fodInfos->defext) + 1) * sizeof(WCHAR)); strcpyW(filterExt, fodInfos->defext); } @@ -2683,7 +2680,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) lstrcatW(lpstrPathAndFile, filterExt); } - HeapFree(GetProcessHeap(), 0, filterExt); + heap_free(filterExt); /* In Open dialog: if file does not exist try without extension */ if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile)) @@ -2996,7 +2993,7 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) /* Copy the extensions */ if (! *lpstrPos) return E_FAIL; /* malformed filter */ - if (!(lpstrExt = MemAlloc((lstrlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL; + if (!(lpstrExt = heap_alloc((lstrlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL; lstrcpyW(lpstrExt,lpstrPos); /* Add the item at the end of the combo */ @@ -3027,7 +3024,7 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) nFilters++; /* Copy the extensions */ - if (!(lpstrExt = MemAlloc((lstrlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL; + if (!(lpstrExt = heap_alloc((lstrlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL; lstrcpyW(lpstrExt,lpstrPos); lpstrPos += lstrlenW(lpstrPos) + 1; @@ -3076,7 +3073,7 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) DWORD len; CharLowerW(lpstrFilter); /* lowercase */ len = lstrlenW(lpstrFilter)+1; - fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) ); + fodInfos->ShellInfos.lpstrCurrentFilter = heap_alloc( len * sizeof(WCHAR) ); lstrcpyW(fodInfos->ShellInfos.lpstrCurrentFilter,lpstrFilter); } } else @@ -3108,7 +3105,7 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) (fodInfos->customfilter == NULL ? 1 : 0); /* Set the current filter with the current selection */ - MemFree(fodInfos->ShellInfos.lpstrCurrentFilter); + heap_free(fodInfos->ShellInfos.lpstrCurrentFilter); lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, iItem); @@ -3117,7 +3114,7 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) DWORD len; CharLowerW(lpstrFilter); /* lowercase */ len = lstrlenW(lpstrFilter)+1; - fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) ); + fodInfos->ShellInfos.lpstrCurrentFilter = heap_alloc( len * sizeof(WCHAR) ); lstrcpyW(fodInfos->ShellInfos.lpstrCurrentFilter,lpstrFilter); if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) SendCustomDlgNotificationMessage(hwnd,CDN_TYPECHANGE); @@ -3170,13 +3167,12 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd) { for(iPos = iCount-1;iPos>=0;iPos--) { - MemFree((LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,iPos)); + heap_free((void *)CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,iPos)); CBDeleteString(fodInfos->DlgInfos.hwndFileTypeCB,iPos); } } /* Current filter */ - MemFree(fodInfos->ShellInfos.lpstrCurrentFilter); - + heap_free(fodInfos->ShellInfos.lpstrCurrentFilter); } /*********************************************************************** @@ -3212,7 +3208,7 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) LPITEMIDLIST pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp; HDC hdc; TEXTMETRICW tm; - LookInInfos *liInfos = MemAlloc(sizeof(LookInInfos)); + LookInInfos *liInfos = heap_alloc_zero(sizeof(*liInfos)); TRACE("%p\n", hwndCombo); @@ -3441,7 +3437,7 @@ static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId) if(!(liInfos = GetPropA(hwnd,LookInInfosStr))) return -1; - tmpFolder = MemAlloc(sizeof(SFOLDER)); + tmpFolder = heap_alloc_zero(sizeof(*tmpFolder)); tmpFolder->m_iIndent = 0; /* Calculate the indentation of the item in the lookin*/ @@ -3487,7 +3483,7 @@ static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId) } COMDLG32_SHFree( tmpFolder->pidlItem ); - MemFree( tmpFolder ); + heap_free( tmpFolder ); return -1; } @@ -3584,7 +3580,7 @@ static int FILEDLG95_LOOKIN_RemoveMostExpandedItem(HWND hwnd) { SFOLDER *tmpFolder = (LPSFOLDER) CBGetItemDataPtr(hwnd,iItemPos); COMDLG32_SHFree(tmpFolder->pidlItem); - MemFree(tmpFolder); + heap_free(tmpFolder); CBDeleteString(hwnd,iItemPos); liInfos->iMaxIndentation--; @@ -3644,13 +3640,13 @@ static void FILEDLG95_LOOKIN_Clean(HWND hwnd) { SFOLDER *tmpFolder = (LPSFOLDER) CBGetItemDataPtr(fodInfos->DlgInfos.hwndLookInCB,iPos); COMDLG32_SHFree(tmpFolder->pidlItem); - MemFree(tmpFolder); + heap_free(tmpFolder); CBDeleteString(fodInfos->DlgInfos.hwndLookInCB,iPos); } } /* LookInInfos structure */ - MemFree(liInfos); + heap_free(liInfos); RemovePropA(fodInfos->DlgInfos.hwndLookInCB,LookInInfosStr); } @@ -3698,7 +3694,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) /* Allocate a buffer */ nAllFilesMaxLength = MAX_PATH + 3; - lpstrAllFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nAllFilesMaxLength * sizeof(WCHAR)); + lpstrAllFiles = heap_alloc_zero(nAllFilesMaxLength * sizeof(WCHAR)); if (!lpstrAllFiles) goto ret; @@ -3745,7 +3741,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) } ret: - HeapFree(GetProcessHeap(), 0, lpstrAllFiles); + heap_free(lpstrAllFiles); COMCTL32_ReleaseStgMedium(medium); } @@ -3797,13 +3793,13 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U /* get the filenames from the filename control */ nStrLen = GetWindowTextLengthW( fodInfos->DlgInfos.hwndFileName ); - lpstrEdit = MemAlloc( (nStrLen+1)*sizeof(WCHAR) ); + lpstrEdit = heap_alloc( (nStrLen+1)*sizeof(WCHAR) ); GetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrEdit, nStrLen+1); TRACE("nStrLen=%u str=%s\n", nStrLen, debugstr_w(lpstrEdit)); nFileCount = COMDLG32_SplitFileNames(lpstrEdit, nStrLen, lpstrFileList, sizeUsed); - MemFree(lpstrEdit); + heap_free(lpstrEdit); return nFileCount; } @@ -4052,18 +4048,6 @@ static BOOL BrowseSelectedFolder(HWND hwnd) return bBrowseSelFolder; } -/* - * Memory allocation methods */ -static void *MemAlloc(UINT size) -{ - return HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,size); -} - -static void MemFree(void *mem) -{ - HeapFree(GetProcessHeap(),0,mem); -} - static inline BOOL valid_struct_size( DWORD size ) { return (size == OPENFILENAME_SIZE_VERSION_400W) || @@ -4220,11 +4204,11 @@ short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf) LPWSTR lpWTitle; RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile); - lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR)); + lpWTitle = heap_alloc(cbBuf * sizeof(WCHAR)); ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf); if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL ); RtlFreeUnicodeString( &strWFile ); - RtlFreeHeap( GetProcessHeap(), 0, lpWTitle ); + heap_free( lpWTitle ); return ret; } diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 0409915737..de04e85998 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -30,6 +30,7 @@ #include "winuser.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "winreg.h" #include "winternl.h" #include "commdlg.h" @@ -231,7 +232,7 @@ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, if (lpdis->CtlType == ODT_LISTBOX && lpdis->CtlID == lst1) { - if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC))) return FALSE; + if (!(str = heap_alloc(BUFFILEALLOC))) return FALSE; SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID, (LPARAM)str); @@ -255,13 +256,13 @@ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, SetBkColor( lpdis->hDC, oldBk ); SetTextColor( lpdis->hDC, oldText ); } - HeapFree(GetProcessHeap(), 0, str); + heap_free(str); return TRUE; } if (lpdis->CtlType == ODT_LISTBOX && lpdis->CtlID == lst2) { - if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC))) + if (!(str = heap_alloc(BUFFILEALLOC))) return FALSE; SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID, (LPARAM)str); @@ -284,13 +285,13 @@ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, SetTextColor( lpdis->hDC, oldText ); } DrawIconEx( lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hFolder, 16, 16, 0, 0, DI_NORMAL ); - HeapFree(GetProcessHeap(), 0, str); + heap_free(str); return TRUE; } if (lpdis->CtlType == ODT_COMBOBOX && lpdis->CtlID == cmb2) { char root[] = "a:"; - if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC))) + if (!(str = heap_alloc(BUFFILEALLOC))) return FALSE; SendMessageW(lpdis->hwndItem, CB_GETLBTEXT, lpdis->itemID, (LPARAM)str); @@ -318,7 +319,7 @@ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, SetTextColor( lpdis->hDC, oldText ); } DrawIconEx( lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hIcon, 16, 16, 0, 0, DI_NORMAL ); - HeapFree(GetProcessHeap(), 0, str); + heap_free(str); return TRUE; } return FALSE; @@ -418,11 +419,11 @@ static LRESULT FD31_DirListDblClick( const FD31_DATA *lfs ) /* get the raw string (with brackets) */ lRet = SendDlgItemMessageW(hWnd, lst2, LB_GETCURSEL, 0, 0); if (lRet == LB_ERR) return TRUE; - pstr = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC); + pstr = heap_alloc(BUFFILEALLOC); SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, lRet, (LPARAM)pstr); strcpyW( tmpstr, pstr ); - HeapFree(GetProcessHeap(), 0, pstr); + heap_free(pstr); /* get the selected directory in tmpstr */ if (tmpstr[0] == '[') { @@ -457,12 +458,12 @@ static LRESULT FD31_FileListSelect( const FD31_DATA *lfs ) return TRUE; /* set the edit control to the chosen file */ - if ((pstr = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC))) + if ((pstr = heap_alloc(BUFFILEALLOC))) { SendDlgItemMessageW(hWnd, lst1, LB_GETTEXT, lRet, (LPARAM)pstr); SetDlgItemTextW( hWnd, edt1, pstr ); - HeapFree(GetProcessHeap(), 0, pstr); + heap_free(pstr); } if (lfs->hook) { @@ -624,11 +625,11 @@ static LRESULT FD31_DiskChange( const FD31_DATA *lfs ) lRet = SendDlgItemMessageW(hWnd, cmb2, CB_GETCURSEL, 0, 0L); if (lRet == LB_ERR) return 0; - pstr = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC); + pstr = heap_alloc(BUFFILEALLOC); SendDlgItemMessageW(hWnd, cmb2, CB_GETLBTEXT, lRet, (LPARAM)pstr); wsprintfW(diskname, FILE_specc, pstr[2]); - HeapFree(GetProcessHeap(), 0, pstr); + heap_free(pstr); return FD31_Validate( lfs, diskname, cmb2, lRet, TRUE ); } @@ -729,7 +730,7 @@ static LPWSTR FD31_MapStringPairsToW(LPCSTR strA, UINT size) if (n < size) n = size; len = MultiByteToWideChar( CP_ACP, 0, strA, n, NULL, 0 ); - x = HeapAlloc(GetProcessHeap(),0, len * sizeof(WCHAR)); + x = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar( CP_ACP, 0, strA, n, x, len ); return x; } @@ -744,7 +745,7 @@ static LPWSTR FD31_DupToW(LPCSTR str, DWORD size) LPWSTR strW = NULL; if (str && (size > 0)) { - strW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + strW = heap_alloc(size * sizeof(WCHAR)); if (strW) MultiByteToWideChar( CP_ACP, 0, str, -1, strW, size ); } return strW; @@ -786,7 +787,7 @@ static void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, LoadStringW(COMDLG32_hInstance, open ? IDS_OPEN_FILE : IDS_SAVE_AS, buf, sizeof(buf)/sizeof(WCHAR)); len = lstrlenW(buf)+1; - title_tmp = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + title_tmp = heap_alloc(len * sizeof(WCHAR)); memcpy(title_tmp, buf, len * sizeof(WCHAR)); ofnW->lpstrTitle = title_tmp; } @@ -819,14 +820,14 @@ static void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, */ static void FD31_FreeOfnW(OPENFILENAMEW *ofnW) { - HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter); - HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter); - HeapFree(GetProcessHeap(), 0, ofnW->lpstrFile); - HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle); - HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir); - HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle); - if (!IS_INTRESOURCE(ofnW->lpTemplateName)) - HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpTemplateName); + heap_free((void *)ofnW->lpstrFilter); + heap_free(ofnW->lpstrCustomFilter); + heap_free(ofnW->lpstrFile); + heap_free(ofnW->lpstrFileTitle); + heap_free((void *)ofnW->lpstrInitialDir); + heap_free((void *)ofnW->lpstrTitle); + if (!IS_INTRESOURCE(ofnW->lpTemplateName)) + heap_free((void *)ofnW->lpTemplateName); } /************************************************************************ @@ -844,9 +845,9 @@ static void FD31_DestroyPrivate(PFD31_DATA lfs) if (lfs->ofnA) { FD31_FreeOfnW(lfs->ofnW); - HeapFree(GetProcessHeap(), 0, lfs->ofnW); + heap_free(lfs->ofnW); } - HeapFree(GetProcessHeap(), 0, lfs); + heap_free(lfs); RemovePropA(hwnd, FD31_OFN_PROP); } @@ -918,7 +919,7 @@ static BOOL FD31_GetTemplate(PFD31_DATA lfs) */ static PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode) { - PFD31_DATA lfs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FD31_DATA)); + FD31_DATA *lfs = heap_alloc_zero(sizeof(*lfs)); TRACE("alloc private buf %p\n", lfs); if (!lfs) return NULL; @@ -940,7 +941,7 @@ static PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode) if (lfs->ofnA->Flags & OFN_ENABLEHOOK) if (lfs->ofnA->lpfnHook) lfs->hook = TRUE; - lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lfs->ofnA->lStructSize); + lfs->ofnW = heap_alloc_zero(lfs->ofnA->lStructSize); lfs->ofnW->lStructSize = lfs->ofnA->lStructSize; FD31_MapOfnStructA(lfs->ofnA, lfs->ofnW, lfs->open); } diff --git a/dlls/comdlg32/finddlg.c b/dlls/comdlg32/finddlg.c index bc4a31c605..d769325e9f 100644 --- a/dlls/comdlg32/finddlg.c +++ b/dlls/comdlg32/finddlg.c @@ -30,6 +30,7 @@ #include "cderr.h" #include "dlgs.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(commdlg); @@ -284,7 +285,7 @@ static INT_PTR CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPA if(iMsg == WM_DESTROY) { RemovePropA(hDlgWnd, (LPSTR)COMDLG32_Atom); - HeapFree(GetProcessHeap(), 0, pdata); + heap_free(pdata); } return retval; @@ -427,7 +428,7 @@ static HWND COMDLG32_FR_DoFindReplace( error = CDERR_DIALOGFAILURE; cleanup: COMDLG32_SetCommDlgExtendedError(error); - HeapFree(GetProcessHeap(), 0, pdata); + heap_free(pdata); } return hdlgwnd; } diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 768ca4a6ea..0c9b4b1c9d 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -32,6 +32,7 @@ #include "commdlg.h" #include "dlgs.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "cderr.h" #include "cdlg.h" @@ -1151,11 +1152,11 @@ static LRESULT CFn_WMDestroy(HWND hwnd, LPCHOOSEFONTW lpcfw) if((lpcfw->Flags & CF_USESTYLE) && lpcfw->lpszStyle) { len = WideCharToMultiByte(CP_ACP, 0, lpcfw->lpszStyle, -1, NULL, 0, 0, 0); WideCharToMultiByte(CP_ACP, 0, lpcfw->lpszStyle, -1, lpcfa->lpszStyle, len, 0, 0); - HeapFree(GetProcessHeap(), 0, lpcfw->lpszStyle); + heap_free(lpcfw->lpszStyle); } - HeapFree(GetProcessHeap(), 0, lpcfw->lpLogFont); - HeapFree(GetProcessHeap(), 0, lpcfw); + heap_free(lpcfw->lpLogFont); + heap_free(lpcfw); SetPropW(hwnd, strWineFontData, 0); return TRUE; @@ -1217,16 +1218,16 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, lpcfa=(LPCHOOSEFONTA)lParam; SetPropW(hDlg, strWineFontData_a, (HANDLE)lParam); - lpcfw = HeapAlloc(GetProcessHeap(), 0, sizeof(CHOOSEFONTW)); + lpcfw = heap_alloc(sizeof(*lpcfw)); memcpy(lpcfw, lpcfa, sizeof(CHOOSEFONTA)); - lpcfw->lpLogFont = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGFONTW)); + lpcfw->lpLogFont = heap_alloc(sizeof(*lpcfw->lpLogFont)); memcpy(lpcfw->lpLogFont, lpcfa->lpLogFont, sizeof(LOGFONTA)); MultiByteToWideChar(CP_ACP, 0, lpcfa->lpLogFont->lfFaceName, LF_FACESIZE, lpcfw->lpLogFont->lfFaceName, LF_FACESIZE); if((lpcfa->Flags & CF_USESTYLE) && lpcfa->lpszStyle) { len = MultiByteToWideChar(CP_ACP, 0, lpcfa->lpszStyle, -1, NULL, 0); - lpcfw->lpszStyle = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + lpcfw->lpszStyle = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, lpcfa->lpszStyle, -1, lpcfw->lpszStyle, len); } -- 2.16.2

1 4

[PATCH v3] iphlpapi: Add support for ConvertLengthToIpv4Mask()
by Dagfinn Reiakvam 19 Mar '18

19 Mar '18

From: Uberdaff <dagfinn(a)reiakvam.no> This patch fixes bug: https://bugs.winehq.org/show_bug.cgi?id=44742 Signed-off-by: Dagfinn Reiakvam <dagfinn(a)reiakvam.no> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 24 ++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 64 ++++++++++++++++++++++++++++++++++++++++++ include/netioapi.h | 1 + 4 files changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index b6c9aef..bbd1ed8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -23,7 +23,7 @@ @ stdcall ConvertInterfaceNameToLuidW( wstr ptr ) #@ stub ConvertInterfacePhysicalAddressToLuid #@ stub ConvertIpv4MaskToLength -#@ stub ConvertLengthToIpv4Mask +@ stdcall ConvertLengthToIpv4Mask( long ptr ) #@ stub ConvertRemoteInterfaceAliasToLuid #@ stub ConvertRemoteInterfaceGuidToLuid #@ stub ConvertRemoteInterfaceIndexToLuid diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 97284ed..62437e0 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,6 +3223,30 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) } /****************************************************************** + * ConvertLengthToIpv4Mask (IPHLPAPI.@) + */ +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG mask_len, PULONG mask) +{ + if(mask_len > 32) + { + *mask = INADDR_NONE; + return ERROR_INVALID_PARAMETER; + } + + if(mask_len == 0) + *mask = 0; + else + { + //IN_ADDR temp; + //temp.S_un.S_addr = 0xffffffff << ( 32 - MaskLength); + //*Mask = temp.S_un.S_un_b.s_b4 + ( temp.S_un.S_un_b.s_b3 <-< 8 ) + ( temp.S_un.S_un_b.s_b2 << 16 ) + ( temp.S_un.S_un_b.s_b1 << 24 ); + *mask = htonl(~0u << (32 - mask_len)); + } + + return NO_ERROR; +} + +/****************************************************************** * if_nametoindex (IPHLPAPI.@) */ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 873612d..039d503 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -96,6 +96,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameW)(const NET_LUID*,WCHAR*,SIZE_ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T); static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,PULONG); static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); @@ -149,6 +150,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask"); pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } @@ -2174,6 +2176,67 @@ static void test_GetUnicastIpAddressTable(void) pFreeMibTable(table); } +static void test_ConvertLengthToIpv4Mask(void) +{ + DWORD apiReturn; + ULONG mask; + + if (!pConvertLengthToIpv4Mask) + { + win_skip( "ConvertLengthToIpv4Mask not available\n" ); + return; + } + + apiReturn = pConvertLengthToIpv4Mask(0, &mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(mask == 0, + "ConvertLengthToIpv4Mask Mask value %x, expected 0x00000000\n", mask); + + apiReturn = pConvertLengthToIpv4Mask(1, &mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(mask == htonl(0x80000000), + "ConvertLengthToIpv4Mask Mask value %x, expected 0x00000080\n", mask); + + apiReturn = pConvertLengthToIpv4Mask(8, &mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(mask == htonl(0xff000000), + "ConvertLengthToIpv4Mask Mask value %x, expected 0x000000ff\n", mask); + + apiReturn = pConvertLengthToIpv4Mask(16, &mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(mask == htonl(0xffff0000), + "ConvertLengthToIpv4Mask Mask value %x, expected 0x0000ffff\n", mask); + + apiReturn = pConvertLengthToIpv4Mask(24, &mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(mask == htonl(0xffffff00), + "ConvertLengthToIpv4Mask Mask value %x, expected 0x00ffffff\n", mask); + + apiReturn = pConvertLengthToIpv4Mask(31, &mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(mask == htonl(0xfffffffe), + "ConvertLengthToIpv4Mask Mask value %x, expected 0xfeffffff\n", mask); + + apiReturn = pConvertLengthToIpv4Mask(32, &mask); + ok(apiReturn == NO_ERROR, + "ConvertLengthToIpv4Mask returned %d, expected NO_ERROR\n", apiReturn); + ok(mask == htonl(0xffffffff), + "ConvertLengthToIpv4Mask Mask value %x, expected 0xffffffff\n", mask); + + apiReturn = pConvertLengthToIpv4Mask(33, &mask); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "ConvertLengthToIpv4Mask(32, &Mask) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + ok(mask == INADDR_NONE, + "ConvertLengthToIpv4Mask Mask value %x, expected INADDR_NONE\n", mask); +} + START_TEST(iphlpapi) { @@ -2201,6 +2264,7 @@ START_TEST(iphlpapi) test_GetIfTable2Ex(); test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); + test_ConvertLengthToIpv4Mask(); freeIPHlpApi(); } } diff --git a/include/netioapi.h b/include/netioapi.h index 1095888..beb93d2 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -170,6 +170,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID*,char*,SIZE_T); DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID*,WCHAR*,SIZE_T); DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG MaskLength, PULONG Mask); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); -- 2.7.4

2 3

[PATCH] ntdll: update version resource.
by Louis Lenders 19 Mar '18

19 Mar '18

Forgot signed-off in first sent version. Fix for bug https://bugs.winehq.org/show_bug.cgi?id=44772

1 0

[PATCH] windowscodecs: Implement WICCreateBitmapFromSectionEx.
by Hans Leidekker 19 Mar '18

19 Mar '18

Based on a patch by Dmitry Timoshkov. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/windowscodecs/bitmap.c | 28 ++++++---- dlls/windowscodecs/imgfactory.c | 95 ++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/bitmap.c | 60 +++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 2 +- dlls/windowscodecs/windowscodecs.spec | 3 +- include/wincodec.idl | 8 +++ 6 files changed, 180 insertions(+), 16 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 6adaab0aea..5de7e39901 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -45,6 +45,8 @@ typedef struct BitmapImpl { int palette_set; LONG lock; /* 0 if not locked, -1 if locked for writing, count if locked for reading */ BYTE *data; + void *view; /* used if data is a section created by an application */ + UINT offset; /* offset into view */ UINT width, height; UINT stride; UINT bpp; @@ -284,7 +286,10 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) if (This->palette) IWICPalette_Release(This->palette); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This->data); + if (This->view) + UnmapViewOfFile(This->view); + else + HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); } @@ -694,13 +699,12 @@ static const IMILUnknown2Vtbl IMILUnknown2Impl_Vtbl = }; HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, - UINT stride, UINT datasize, BYTE *bits, + UINT stride, UINT datasize, BYTE *data, void *view, UINT offset, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { HRESULT hr; BitmapImpl *This; - BYTE *data; UINT bpp; hr = get_pixelformat_bpp(pixelFormat, &bpp); @@ -713,14 +717,18 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, if (stride < ((bpp*uiWidth)+7)/8) return E_INVALIDARG; This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); - if (!This || !data) + if (!This) return E_OUTOFMEMORY; + + if (view) data = (BYTE *)view + offset; + else if (!data) { - HeapFree(GetProcessHeap(), 0, This); - HeapFree(GetProcessHeap(), 0, data); - return E_OUTOFMEMORY; + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); + if (!data) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } } - if (bits) memcpy(data, bits, datasize); This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; This->IMILBitmapSource_iface.lpVtbl = &IMILBitmapImpl_Vtbl; @@ -731,6 +739,8 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, This->palette_set = 0; This->lock = 0; This->data = data; + This->view = view; + This->offset = offset; This->width = uiWidth; This->height = uiHeight; This->stride = stride; diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index e1bcc89a8b..2cef8dc37f 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -473,7 +473,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmap(IWICComponentFactory *iface, { TRACE("(%p,%u,%u,%s,%u,%p)\n", iface, uiWidth, uiHeight, debugstr_guid(pixelFormat), option, ppIBitmap); - return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, pixelFormat, option, ppIBitmap); + return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, NULL, 0, pixelFormat, option, ppIBitmap); } static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFactory *iface, @@ -520,7 +520,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto } if (SUCCEEDED(hr)) - hr = BitmapImpl_Create(width, height, 0, 0, NULL, &pixelformat, option, &result); + hr = BitmapImpl_Create(width, height, 0, 0, NULL, NULL, 0, &pixelformat, option, &result); if (SUCCEEDED(hr)) { @@ -595,12 +595,36 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromMemory(IWICComponentFacto UINT width, UINT height, REFWICPixelFormatGUID format, UINT stride, UINT size, BYTE *buffer, IWICBitmap **bitmap) { + HRESULT hr; + TRACE("(%p,%u,%u,%s,%u,%u,%p,%p\n", iface, width, height, debugstr_guid(format), stride, size, buffer, bitmap); if (!stride || !size || !buffer || !bitmap) return E_INVALIDARG; - return BitmapImpl_Create(width, height, stride, size, buffer, format, WICBitmapCacheOnLoad, bitmap); + hr = BitmapImpl_Create(width, height, stride, size, NULL, NULL, 0, format, WICBitmapCacheOnLoad, bitmap); + if (SUCCEEDED(hr)) + { + IWICBitmapLock *lock; + + hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock); + if (SUCCEEDED(hr)) + { + UINT buffersize; + BYTE *data; + + IWICBitmapLock_GetDataPointer(lock, &buffersize, &data); + memcpy(data, buffer, buffersize); + + IWICBitmapLock_Release(lock); + } + else + { + IWICBitmap_Release(*bitmap); + *bitmap = NULL; + } + } + return hr; } static BOOL get_16bpp_format(HBITMAP hbm, WICPixelFormatGUID *format) @@ -710,7 +734,8 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFact return E_INVALIDARG; } - hr = BitmapImpl_Create(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, 0, NULL, &format, WICBitmapCacheOnLoad, bitmap); + hr = BitmapImpl_Create(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, 0, NULL, NULL, 0, &format, + WICBitmapCacheOnLoad, bitmap); if (hr != S_OK) return hr; hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock); @@ -794,7 +819,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactor stride = width * 4; size = stride * height; - hr = BitmapImpl_Create(width, height, stride, size, NULL, + hr = BitmapImpl_Create(width, height, stride, size, NULL, NULL, 0, &GUID_WICPixelFormat32bppBGRA, WICBitmapCacheOnLoad, bitmap); if (hr != S_OK) goto failed; @@ -1176,3 +1201,63 @@ HRESULT ComponentFactory_CreateInstance(REFIID iid, void** ppv) return ret; } + +HRESULT WINAPI WICCreateBitmapFromSectionEx(UINT width, UINT height, + REFWICPixelFormatGUID format, HANDLE section, UINT stride, + UINT offset, WICSectionAccessLevel wicaccess, IWICBitmap **bitmap) +{ + SYSTEM_INFO sysinfo; + UINT bpp, access, size, view_offset, view_size; + void *view; + HRESULT hr; + + TRACE("%u,%u,%s,%p,%u,%u,%#x,%p\n", width, height, debugstr_guid(format), + section, stride, offset, wicaccess, bitmap); + + if (!width || !height || !section || !bitmap) return E_INVALIDARG; + + hr = get_pixelformat_bpp(format, &bpp); + if (FAILED(hr)) return hr; + + switch (wicaccess) + { + case WICSectionAccessLevelReadWrite: + access = FILE_MAP_READ | FILE_MAP_WRITE; + break; + + case WICSectionAccessLevelRead: + access = FILE_MAP_READ; + break; + + default: + FIXME("unsupported access %#x\n", wicaccess); + return E_INVALIDARG; + } + + if (!stride) stride = (((bpp * width) + 31) / 32) * 4; + size = stride * height; + if (size / height != stride || offset > size) return E_INVALIDARG; + + GetSystemInfo(&sysinfo); + view_offset = offset - (offset % sysinfo.dwAllocationGranularity); + view_size = size + (offset - view_offset); + + view = MapViewOfFile(section, access, 0, view_offset, view_size); + if (!view) return HRESULT_FROM_WIN32(GetLastError()); + + offset -= view_offset; + hr = BitmapImpl_Create(width, height, stride, 0, NULL, view, offset, format, WICBitmapCacheOnLoad, bitmap); + if (FAILED(hr)) UnmapViewOfFile(view); + return hr; +} + +HRESULT WINAPI WICCreateBitmapFromSection(UINT width, UINT height, + REFWICPixelFormatGUID format, HANDLE section, + UINT stride, UINT offset, IWICBitmap **bitmap) +{ + TRACE("%u,%u,%s,%p,%u,%u,%p\n", width, height, debugstr_guid(format), + section, stride, offset, bitmap); + + return WICCreateBitmapFromSectionEx(width, height, format, section, + stride, offset, WICSectionAccessLevelRead, bitmap); +} diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 42f452acaf..6e01f0b1d1 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -972,6 +972,64 @@ static void test_clipper(void) IWICBitmapClipper_Release(clipper); } +static HRESULT (WINAPI *pWICCreateBitmapFromSectionEx) + (UINT, UINT, REFWICPixelFormatGUID, HANDLE, UINT, UINT, WICSectionAccessLevel, IWICBitmap **); + +static void test_WICCreateBitmapFromSectionEx(void) +{ + SYSTEM_INFO sysinfo; + HANDLE hsection; + BITMAPINFO info; + void *bits; + HBITMAP hdib; + IWICBitmap *bitmap; + HRESULT hr; + pWICCreateBitmapFromSectionEx = + (void *)GetProcAddress(LoadLibraryA("windowscodecs"), "WICCreateBitmapFromSectionEx"); + + if (!pWICCreateBitmapFromSectionEx) + { + win_skip("WICCreateBitmapFromSectionEx not available\n"); + return; + } + + GetSystemInfo(&sysinfo); + hsection = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, + sysinfo.dwAllocationGranularity * 2, NULL); + ok(hsection != NULL, "CreateFileMapping failed %u\n", GetLastError()); + + memset(&info, 0, sizeof(info)); + info.bmiHeader.biSize = sizeof(info.bmiHeader); + info.bmiHeader.biWidth = 3; + info.bmiHeader.biHeight = -3; + info.bmiHeader.biBitCount = 24; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biCompression = BI_RGB; + + hdib = CreateDIBSection(0, &info, DIB_RGB_COLORS, &bits, hsection, 0); + ok(hdib != NULL, "CreateDIBSection failed\n"); + + hr = pWICCreateBitmapFromSectionEx(3, 3, &GUID_WICPixelFormat24bppBGR, hsection, 0, 0, + WICSectionAccessLevelReadWrite, &bitmap); + ok(hr == S_OK, "WICCreateBitmapFromSectionEx returned %#x\n", hr); + IWICBitmap_Release(bitmap); + + /* non-zero offset, smaller than allocation granularity */ + hr = pWICCreateBitmapFromSectionEx(3, 3, &GUID_WICPixelFormat24bppBGR, hsection, 0, 0x100, + WICSectionAccessLevelReadWrite, &bitmap); + ok(hr == S_OK, "WICCreateBitmapFromSectionEx returned %#x\n", hr); + IWICBitmap_Release(bitmap); + + /* offset larger than allocation granularity */ + hr = pWICCreateBitmapFromSectionEx(3, 3, &GUID_WICPixelFormat24bppBGR, hsection, 0, + sysinfo.dwAllocationGranularity + 1, + WICSectionAccessLevelReadWrite, &bitmap); + ok(hr == S_OK, "WICCreateBitmapFromSectionEx returned %#x\n", hr); + IWICBitmap_Release(bitmap); + DeleteObject(hdib); + CloseHandle(hsection); +} + START_TEST(bitmap) { HRESULT hr; @@ -992,4 +1050,6 @@ START_TEST(bitmap) IWICImagingFactory_Release(factory); CoUninitialize(); + + test_WICCreateBitmapFromSectionEx(); } diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 8bba811250..4647d07fa8 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -91,7 +91,7 @@ extern HRESULT IcnsEncoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDE extern HRESULT TgaDecoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, - UINT stride, UINT datasize, BYTE *bits, + UINT stride, UINT datasize, BYTE *bits, void *view, UINT offset, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) DECLSPEC_HIDDEN; extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 49346fc86b..905ef835af 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -105,7 +105,8 @@ @ stdcall IWICStream_InitializeFromIStream_Proxy(ptr ptr) IWICStream_InitializeFromIStream_Proxy_W @ stdcall IWICStream_InitializeFromMemory_Proxy(ptr ptr long) IWICStream_InitializeFromMemory_Proxy_W @ stdcall WICConvertBitmapSource(ptr ptr ptr) -@ stub WICCreateBitmapFromSection +@ stdcall WICCreateBitmapFromSection(long long ptr long long long ptr) +@ stdcall WICCreateBitmapFromSectionEx(long long ptr long long long long ptr) @ stdcall WICCreateColorContext_Proxy(ptr ptr) @ stdcall WICCreateImagingFactory_Proxy(long ptr) @ stub WICGetMetadataContentSize diff --git a/include/wincodec.idl b/include/wincodec.idl index f2c5a9e626..50d7db7620 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -189,6 +189,12 @@ typedef enum WICPngFilterOption { WICPNFFILTEROPTION_FORCE_DWORD = CODEC_FORCE_DWORD } WICPngFilterOption; +typedef enum WICSectionAccessLevel { + WICSectionAccessLevelRead = 0x00000001, + WICSectionAccessLevelReadWrite = 0x00000003, + WICSectionAccessLevel_FORCE_DWORD = CODEC_FORCE_DWORD +} WICSectionAccessLevel; + typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID; @@ -1058,6 +1064,8 @@ interface IWICEnumMetadataItem : IUnknown } cpp_quote("HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst);") +cpp_quote("HRESULT WINAPI WICCreateBitmapFromSection(UINT width, UINT height, REFWICPixelFormatGUID format, HANDLE section, UINT stride, UINT offset, IWICBitmap **bitmap);") +cpp_quote("HRESULT WINAPI WICCreateBitmapFromSectionEx(UINT width, UINT height, REFWICPixelFormatGUID format, HANDLE section, UINT stride, UINT offset, WICSectionAccessLevel access, IWICBitmap **bitmap);") cpp_quote("HRESULT WINAPI WICMapGuidToShortName(REFGUID,UINT,WCHAR *,UINT *);") cpp_quote("HRESULT WINAPI WICMapShortNameToGuid(PCWSTR,GUID *);") -- 2.11.0

2 1

[PATCH] kernel32: Silence repeated LocaleNameToLCID unsupported flags
by Louis Lenders 19 Mar '18

19 Mar '18

From: Jarkko Korpi <jarkko_korpi(a)hotmail.com> (I sent author a mail if it was ok to send it upstream but up to now got no answer, but i assume it`s ok with him as it`s really trivial change) Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com>

1 0

[PATCH 5/5] usp10: Use usp10_array_reserve() in GSUB_initialize_language_cache().
by Henri Verbeet 19 Mar '18

19 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/opentype.c | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 616835e8d97..49a88a6991d 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2690,33 +2690,38 @@ static LoadedLanguage *usp10_script_get_language(LoadedScript *script, OPENTYPE_ static void GSUB_initialize_language_cache(LoadedScript *script) { - int i; + const OT_Script *table; + DWORD offset; + SIZE_T i; - if (script->table[USP10_SCRIPT_TABLE_GSUB]) + if (!(table = script->table[USP10_SCRIPT_TABLE_GSUB])) + return; + + if ((offset = GET_BE_WORD(table->DefaultLangSys))) { - DWORD offset; - const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GSUB]; - script->language_count = GET_BE_WORD(table->LangSysCount); - offset = GET_BE_WORD(table->DefaultLangSys); - if (offset) - { - script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); - script->default_language.gsub_table = (const BYTE*)table + offset; - } + script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); + script->default_language.gsub_table = (const BYTE *)table + offset; + } - if (script->language_count) - { - TRACE("Deflang %p, LangCount %li\n",script->default_language.gsub_table, script->language_count); + if (!(script->language_count = GET_BE_WORD(table->LangSysCount))) + return; - script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); + TRACE("Deflang %p, LangCount %lu.\n", script->default_language.gsub_table, script->language_count); - for (i = 0; i < script->language_count; i++) - { - int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); - script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].gsub_table = ((const BYTE*)table + offset); - } - } + if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, + script->language_count, sizeof(*script->languages))) + { + ERR("Failed to grow languages array.\n"); + return; + } + + for (i = 0; i < script->language_count; ++i) + { + script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], + table->LangSysRecord[i].LangSysTag[1], + table->LangSysRecord[i].LangSysTag[2], + table->LangSysRecord[i].LangSysTag[3]); + script->languages[i].gsub_table = (const BYTE *)table + GET_BE_WORD(table->LangSysRecord[i].LangSys); } } -- 2.11.0

2 1

[PATCH 5/5] usp10: Merge GSUB_initialize_script_cache() and GPOS_expand_script_cache().
by Henri Verbeet 19 Mar '18

19 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/opentype.c | 78 ++++++++++++++++----------------------------- dlls/usp10/usp10_internal.h | 10 ++++-- 2 files changed, 35 insertions(+), 53 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 521b816d07d..616835e8d97 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2595,54 +2595,21 @@ static LoadedScript *usp10_script_cache_get_script(ScriptCache *script_cache, OP return NULL; } -static void GSUB_initialize_script_cache(ScriptCache *psc) -{ - const OT_ScriptList *script; - const GSUB_Header *header; - SIZE_T i; - - if (!(header = psc->GSUB_Table)) - return; - - script = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList)); - psc->script_count = GET_BE_WORD(script->ScriptCount); - - TRACE("Initialising %li scripts in this font.\n", psc->script_count); - - if (!psc->script_count) - return; - - if (!usp10_array_reserve((void **)&psc->scripts, &psc->scripts_size, psc->script_count, sizeof(*psc->scripts))) - ERR("Failed to allocate script array.\n"); - - for (i = 0; i < psc->script_count; ++i) - { - psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], - script->ScriptRecord[i].ScriptTag[1], - script->ScriptRecord[i].ScriptTag[2], - script->ScriptRecord[i].ScriptTag[3]); - psc->scripts[i].gsub_table = (const BYTE *)script + GET_BE_WORD(script->ScriptRecord[i].Script); - } -} - -static void GPOS_expand_script_cache(ScriptCache *psc) +static void usp10_script_cache_add_script_list(ScriptCache *script_cache, + enum usp10_script_table table, const OT_ScriptList *list) { SIZE_T initial_count, count, i; - const OT_ScriptList *list; - const GPOS_Header *header; LoadedScript *script; OPENTYPE_TAG tag; - if (!(header = psc->GPOS_Table)) - return; + TRACE("script_cache %p, table %#x, list %p.\n", script_cache, table, list); - list = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList)); if (!(count = GET_BE_WORD(list->ScriptCount))) return; - TRACE("Initialising %lu scripts in this font.\n", count); + TRACE("Adding %lu scripts.\n", count); - initial_count = psc->script_count; + initial_count = script_cache->script_count; for (i = 0; i < count; ++i) { tag = MS_MAKE_TAG(list->ScriptRecord[i].ScriptTag[0], @@ -2650,22 +2617,31 @@ static void GPOS_expand_script_cache(ScriptCache *psc) list->ScriptRecord[i].ScriptTag[2], list->ScriptRecord[i].ScriptTag[3]); - if (!(initial_count && (script = usp10_script_cache_get_script(psc, tag))) - && !(script = usp10_script_cache_add_script(psc, tag))) + if (!(initial_count && (script = usp10_script_cache_get_script(script_cache, tag))) + && !(script = usp10_script_cache_add_script(script_cache, tag))) return; - script->gpos_table = (const BYTE *)list + GET_BE_WORD(list->ScriptRecord[i].Script); + script->table[table] = (const BYTE *)list + GET_BE_WORD(list->ScriptRecord[i].Script); } } -static void _initialize_script_cache(ScriptCache *psc) +static void _initialize_script_cache(ScriptCache *script_cache) { - if (!psc->scripts_initialized) - { - GSUB_initialize_script_cache(psc); - GPOS_expand_script_cache(psc); - psc->scripts_initialized = TRUE; - } + const GPOS_Header *gpos_header; + const GSUB_Header *gsub_header; + + if (script_cache->scripts_initialized) + return; + + if ((gsub_header = script_cache->GSUB_Table)) + usp10_script_cache_add_script_list(script_cache, USP10_SCRIPT_TABLE_GSUB, + (const OT_ScriptList *)((const BYTE *)gsub_header + GET_BE_WORD(gsub_header->ScriptList))); + + if ((gpos_header = script_cache->GPOS_Table)) + usp10_script_cache_add_script_list(script_cache, USP10_SCRIPT_TABLE_GPOS, + (const OT_ScriptList *)((const BYTE *)gpos_header + GET_BE_WORD(gpos_header->ScriptList))); + + script_cache->scripts_initialized = TRUE; } HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) @@ -2716,10 +2692,10 @@ static void GSUB_initialize_language_cache(LoadedScript *script) { int i; - if (script->gsub_table) + if (script->table[USP10_SCRIPT_TABLE_GSUB]) { DWORD offset; - const OT_Script* table = script->gsub_table; + const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GSUB]; script->language_count = GET_BE_WORD(table->LangSysCount); offset = GET_BE_WORD(table->DefaultLangSys); if (offset) @@ -2747,7 +2723,7 @@ static void GSUB_initialize_language_cache(LoadedScript *script) static void GPOS_expand_language_cache(LoadedScript *script) { int count; - const OT_Script* table = script->gpos_table; + const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GPOS]; LoadedLanguage *language; DWORD offset; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index eae02552d83..08024c90227 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -161,10 +161,16 @@ typedef struct { LoadedFeature *features; } LoadedLanguage; +enum usp10_script_table +{ + USP10_SCRIPT_TABLE_GSUB = 0, + USP10_SCRIPT_TABLE_GPOS, + USP10_SCRIPT_TABLE_COUNT +}; + typedef struct { OPENTYPE_TAG tag; - const void *gsub_table; - const void *gpos_table; + const void *table[USP10_SCRIPT_TABLE_COUNT]; LoadedLanguage default_language; BOOL languages_initialized; LoadedLanguage *languages; -- 2.11.0

2 1

[PATCH] imm32: Fix capitalization of ImmDisableLegacyIME in its comment
by Alex Henrie 19 Mar '18

19 Mar '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/imm32/imm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 377a277513..685eb018c4 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3147,7 +3147,7 @@ BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) } /*********************************************************************** - * IMMDisableLegacyIME(IMM32.@) + * ImmDisableLegacyIME(IMM32.@) */ BOOL WINAPI ImmDisableLegacyIME(void) { -- 2.16.2

2 1

[PATCH 1/2] advapi32: Introduce ARRAY_SIZE macro.
by Gijs Vermeulen 19 Mar '18

19 Mar '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/advapi32/advapi32_misc.h | 2 ++ dlls/advapi32/cred.c | 12 ++++++------ dlls/advapi32/registry.c | 4 +--- dlls/advapi32/security.c | 22 +++++++++++----------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 4ced1e8a64..be3873a4b4 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -25,6 +25,8 @@ #include "winnls.h" #include "wine/heap.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index df4142113c..49a1c34d1c 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -248,7 +248,7 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require SecKeychainAttributeList *attr_list; UInt32 info_tags[] = { kSecServiceItemAttr, kSecAccountItemAttr, kSecCommentItemAttr, kSecCreationDateItemAttr }; - info.count = sizeof(info_tags)/sizeof(info_tags[0]); + info.count = ARRAY_SIZE(info_tags); info.tag = info_tags; info.format = NULL; status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, &cred_blob_len, &cred_blob); @@ -641,12 +641,12 @@ static LPWSTR get_key_name_for_target(LPCWSTR target_name, DWORD type) if (type == CRED_TYPE_GENERIC) { prefix = wszGenericPrefix; - len += sizeof(wszGenericPrefix)/sizeof(wszGenericPrefix[0]); + len += ARRAY_SIZE(wszGenericPrefix); } else { prefix = wszDomPasswdPrefix; - len += sizeof(wszDomPasswdPrefix)/sizeof(wszDomPasswdPrefix[0]); + len += ARRAY_SIZE(wszDomPasswdPrefix); } key_name = heap_alloc(len * sizeof(WCHAR)); @@ -792,7 +792,7 @@ static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials UInt32 info_tags[] = { kSecServiceItemAttr }; BOOL match; - info.count = sizeof(info_tags)/sizeof(info_tags[0]); + info.count = ARRAY_SIZE(info_tags); info.tag = info_tags; info.format = NULL; status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); @@ -851,7 +851,7 @@ static DWORD mac_delete_credential(LPCWSTR TargetName) UInt32 info_tags[] = { kSecServiceItemAttr }; LPWSTR target_name; INT str_len; - info.count = sizeof(info_tags)/sizeof(info_tags[0]); + info.count = ARRAY_SIZE(info_tags); info.tag = info_tags; info.format = NULL; status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); @@ -1439,7 +1439,7 @@ BOOL WINAPI CredReadW(LPCWSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALW UInt32 info_tags[] = { kSecServiceItemAttr }; LPWSTR target_name; INT str_len; - info.count = sizeof(info_tags)/sizeof(info_tags[0]); + info.count = ARRAY_SIZE(info_tags); info.tag = info_tags; info.format = NULL; status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7a26fffc55..44b4bedb07 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -84,9 +84,7 @@ static const WCHAR * const root_key_names[] = name_DYN_DATA }; -#define NB_SPECIAL_ROOT_KEYS (sizeof(root_key_names)/sizeof(root_key_names[0])) - -static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; +static HKEY special_root_keys[ARRAY_SIZE(root_key_names)]; static BOOL hkcu_cache_disabled; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6f4fb44ae9..f081b6b803 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -964,7 +964,7 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, return FALSE; } - for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) { if (WellKnownSids[i].Type == WellKnownSidType) { DWORD length = GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); @@ -991,7 +991,7 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, return FALSE; } - for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownRids); i++) if (WellKnownRids[i].Type == WellKnownSidType) { UCHAR domain_subauth = *GetSidSubAuthorityCount(DomainSid); DWORD domain_sid_length = GetSidLengthRequired(domain_subauth); @@ -1028,7 +1028,7 @@ IsWellKnownSid( PSID pSid, WELL_KNOWN_SID_TYPE WellKnownSidType ) unsigned int i; TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); - for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) if (WellKnownSids[i].Type == WellKnownSidType) if (EqualSid(pSid, (PSID)&(WellKnownSids[i].Sid.Revision))) return TRUE; @@ -2252,7 +2252,7 @@ LookupAccountSidW( /* check the well known SIDs first */ for (i = 0; i <= WinAccountProtectedUsersSid; i++) { if (IsWellKnownSid(sid, i)) { - for (j = 0; j < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); j++) { + for (j = 0; j < ARRAY_SIZE(ACCOUNT_SIDS); j++) { if (ACCOUNT_SIDS[j].type == i) { ac = ACCOUNT_SIDS[j].account; dm = ACCOUNT_SIDS[j].domain; @@ -2937,7 +2937,7 @@ BOOL lookup_local_wellknown_name( const LSA_UNICODE_STRING *account_and_domain, *handled = FALSE; split_domain_account( account_and_domain, &account, &domain ); - for (i = 0; i < sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0]); i++) + for (i = 0; i < ARRAY_SIZE(ACCOUNT_SIDS); i++) { /* check domain first */ if (domain.Buffer && !match_domain( i, &domain )) continue; @@ -4926,7 +4926,7 @@ static BOOL DumpSidNumeric(PSID psid, WCHAR **pwptr, ULONG *plen) static BOOL DumpSid(PSID psid, WCHAR **pwptr, ULONG *plen) { size_t i; - for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) { if (WellKnownSids[i].wstr[0] && EqualSid(psid, (PSID)&(WellKnownSids[i].Sid.Revision))) { @@ -4983,7 +4983,7 @@ static void DumpRights(DWORD mask, WCHAR **pwptr, ULONG *plen) return; /* first check if the right have name */ - for (i = 0; i < sizeof(AceRights)/sizeof(AceRights[0]); i++) + for (i = 0; i < ARRAY_SIZE(AceRights); i++) { if (AceRights[i].wstr == NULL) break; @@ -5633,11 +5633,11 @@ static DWORD ComputeStringSidSize(LPCWSTR StringSid) { unsigned int i; - for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) return GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); - for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownRids); i++) if (!strncmpW(WellKnownRids[i].wstr, StringSid, 2)) { MAX_SID local; @@ -5740,7 +5740,7 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) unsigned int i; pisid->Revision = SDDL_REVISION; - for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) { DWORD j; @@ -5751,7 +5751,7 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) bret = TRUE; } - for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownRids); i++) if (!strncmpW(WellKnownRids[i].wstr, StringSid, 2)) { ADVAPI_GetComputerSid(pisid); -- 2.13.6

1 1

[PATCH] kernel32: add GetNumaNodeProcessorMaskEx stub
by Austin English 19 Mar '18

19 Mar '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=44776 FFMpeg has a crash at the end of encoding, but it appears to be an unrelated issue, as I'm able to re-encode a video with h265 and play it in VLC. Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3a0bef93e7..aae22eb650 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -746,7 +746,7 @@ @ stdcall GetNumaHighestNodeNumber(ptr) # @ stub GetNumaNodeNumberFromHandle @ stdcall GetNumaNodeProcessorMask(long ptr) -# @ stub GetNumaNodeProcessorMaskEx +@ stdcall GetNumaNodeProcessorMaskEx(long ptr) # @ stub GetNumaProcessorMap @ stdcall GetNumaProcessorNode(long ptr) # @ stub GetNumaProcessorNodeEx diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4798100d2c..0783ef870e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4373,3 +4373,13 @@ BOOL WINAPI BaseFlushAppcompatCache(void) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * GetNumaNodeProcessorMaskEx (KERNEL32.@) + */ +BOOL WINAPI GetNumaNodeProcessorMaskEx(USHORT node, PGROUP_AFFINITY mask) +{ + FIXME("(%hu %p): stub\n", node, mask); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} -- 2.16.1

1 0

[PATCH] ntdll: update version resource.
by Louis Lenders 19 Mar '18

19 Mar '18

Fix for bug https://bugs.winehq.org/show_bug.cgi?id=44772

1 0

[PATCH] ucrtbase: Add __current_exception() implementation
by Piotr Caban 19 Mar '18

19 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/except.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-)

1 0

How to close a process
by Carlos Vega García 19 Mar '18

19 Mar '18

Hi! I’m doing a test for the explorer.exe. The first part tests if the explorer Windows open. For that I´m using the function CreateProcessA(), the problem is that I can’t close the explorer that I have created. This is what I have try and it haven’t worked. Any idea of how could I do it? testExplorer = CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); if (testExplorer != NULL) { /*WaitForSingleObject(testExplorer, 3000); */ /* CloseHandle(testExplorer); */ /* CloseHandle(pi.hThread); CloseHandle(pi.hProcess); */ /* GetExitCodeProcess(testExplorer,lpExitCode); ExitProcess(lpExitCode); */ /* GetExitCodeThread(testExplorer,lpExitCode); TerminateProcess(testExplorer,lpExitCode); */ trace("\n \n Error: %u \n \n", GetLastError()); return TRUE; }

2 1

[PATCH 1/2] winevulkan: add helper function for VkDeviceCreateInfo conversion.
by Roderick Colenbrander 19 Mar '18

19 Mar '18

Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> --- dlls/winevulkan/vulkan.c | 74 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 9440000614..87c871d0f4 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -98,6 +98,64 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, return queues; } +/* Helper function to convert win32 VkDeviceCreateInfo to host compatible. */ +static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src, + VkDeviceCreateInfo *dst) +{ + unsigned int i; + + dst->sType = src->sType; + dst->flags = src->flags; + + /* Application and loader can pass in a chain of extensions through pNext. + * We can't blindly pass these through as often these contain callbacks or + * they can even be pass structures for loader / ICD internal use. For now + * we ignore everything in pNext chain, but we print FIXMEs. + */ + if (src->pNext) + { + const struct wine_vk_structure_header *header; + + for (header = src->pNext; header; header = header->pNext) + { + switch (header->sType) + { + case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO: + /* Used for loader to ICD communication. Ignore to not confuse + * host loader. + */ + break; + + default: + FIXME("Application requested a linked structure of type %d\n", header->sType); + } + } + } + /* For now don't support anything. */ + dst->pNext = NULL; + + dst->queueCreateInfoCount = src->queueCreateInfoCount; + dst->pQueueCreateInfos = src->pQueueCreateInfos; + + /* Should be filtered out by loader as ICDs don't support layers. */ + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + + /* TODO: convert win32 extensions here to host specific ones. */ + dst->ppEnabledExtensionNames = src->ppEnabledExtensionNames; + dst->enabledExtensionCount = src->enabledExtensionCount; + + TRACE("Enabled extensions: %d\n", dst->enabledExtensionCount); + for (i = 0; i < dst->enabledExtensionCount; i++) + { + TRACE("Extension %d: %s\n", i, dst->ppEnabledExtensionNames[i]); + } + + dst->pEnabledFeatures = src->pEnabledFeatures; + + return VK_SUCCESS; +} + /* Helper function used for freeing a device structure. This function supports full * and partial object cleanups and can thus be used for vkCreateDevice failures. */ @@ -470,6 +528,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, const VkAllocationCallbacks *allocator, VkDevice *device) { struct VkDevice_T *object = NULL; + VkDeviceCreateInfo create_info_host; uint32_t max_queue_families; VkResult res; unsigned int i; @@ -485,11 +544,18 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + res = wine_vk_device_convert_create_info(create_info, &create_info_host); + if (res != VK_SUCCESS) + { + ERR("Failed to convert device create info, res=%d\n", res); + goto err; + } + /* At least for now we can directly pass create_info through. All extensions we report * should be compatible. In addition the loader is supposed to sanitize values e.g. layers. */ res = phys_dev->instance->funcs.p_vkCreateDevice(phys_dev->phys_dev, - create_info, NULL /* allocator */, &object->device); + &create_info_host, NULL /* allocator */, &object->device); if (res != VK_SUCCESS) { ERR("Failed to create device\n"); @@ -524,10 +590,10 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, goto err; } - for (i = 0; i < create_info->queueCreateInfoCount; i++) + for (i = 0; i < create_info_host.queueCreateInfoCount; i++) { - uint32_t family_index = create_info->pQueueCreateInfos[i].queueFamilyIndex; - uint32_t queue_count = create_info->pQueueCreateInfos[i].queueCount; + uint32_t family_index = create_info_host.pQueueCreateInfos[i].queueFamilyIndex; + uint32_t queue_count = create_info_host.pQueueCreateInfos[i].queueCount; TRACE("queueFamilyIndex %u, queueCount %u\n", family_index, queue_count); -- 2.14.3

2 3

[PATCH] IPHLPAPI.DLL: Implement functions ConvertLengthToIpv4Mask and ConvertIpv4MaskToLength
by Roger Zoellner 19 Mar '18

19 Mar '18

--- dlls/iphlpapi/iphlpapi.spec | 4 ++-- dlls/iphlpapi/iphlpapi_main.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index b6c9aef2f8..167c646de4 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -22,8 +22,8 @@ @ stdcall ConvertInterfaceNameToLuidA( str ptr ) @ stdcall ConvertInterfaceNameToLuidW( wstr ptr ) #@ stub ConvertInterfacePhysicalAddressToLuid -#@ stub ConvertIpv4MaskToLength -#@ stub ConvertLengthToIpv4Mask +@ stdcall ConvertIpv4MaskToLength ( long ptr ) +@ stdcall ConvertLengthToIpv4Mask( long ptr) #@ stub ConvertRemoteInterfaceAliasToLuid #@ stub ConvertRemoteInterfaceGuidToLuid #@ stub ConvertRemoteInterfaceIndexToLuid diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 97284edbe6..87f35dd170 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -429,6 +429,54 @@ DWORD WINAPI CreateSortedAddressPairs( const PSOCKADDR_IN6 src_list, DWORD src_c } +/****************************************************************** + * ConvertLengthToIpv4Mask (IPHLPAPI.@) + */ +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG mask_length, ULONG *mask) +{ + if (mask_length > 32) + { + *mask = INADDR_NONE; + return ERROR_INVALID_PARAMETER; + } + + if (mask_length == 0) + { + *mask = 0; + return NO_ERROR; + } + + *mask = htonl(0xFFFFFFFF << (32 - mask_length)); + return NO_ERROR; +} + + +/****************************************************************** + * ConvertIpv4MaskToLength (IPHLPAPI.@) + */ +DWORD WINAPI ConvertIpv4MaskToLength(DWORD mask, UINT8 *mask_length) +{ + int i; + mask = ntohl(mask); + + for (i = 0; i < 32; i++) + { + if (!((mask << i) & 0x80000000)) + { + if (!((mask << i) & 0xFFFFFFFF)) + { + break; + } + + return ERROR_INVALID_PARAMETER; + } + } + + *mask_length = i; + return NO_ERROR; +} + + /****************************************************************** * DeleteIPAddress (IPHLPAPI.@) * -- 2.16.2

2 1

[PATCH v3 1/3] kernel32: Add forward slash path handling to GetVolumePathNameW.
by Mark White 19 Mar '18

19 Mar '18

From: Mark White <chopinbig2(a)gmail.com> Fixes https://bugs.winehq.org/show_bug.cgi?id=42446 GetVolumePathNameW is causing some incompatibity problems with some Windows applications such as Native Instruments "Native Access" because of an inability to handle path names containing forward slash's whereas the Windows GetVolumePathName's behaviour handles path names with both forward and back slash's. Tested on Debian Stretch and Windows Vista Signed-off-by: Mark White <chopinbig2(a)gmail.com> --- dlls/kernel32/tests/volume.c | 4 ++++ dlls/kernel32/volume.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 365e38c444..c47043d288 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -772,6 +772,10 @@ static void test_GetVolumePathNameA(void) "s:omefile", "S:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_FILE_NOT_FOUND, NO_ERROR }, + { /* test 42: a reasonable forward slash path that is guaranteed to exist */ + "C:/windows/system32", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, }; BOOL ret, success; DWORD error; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index b4163f02eb..ac887b2f3f 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1670,6 +1670,7 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu WCHAR fallbackpathW[] = { 'C',':','\\',0 }; NTSTATUS status = STATUS_SUCCESS; WCHAR *volumenameW = NULL, *c; + WCHAR *fwdslash; int pos, last_pos, stop_pos; UNICODE_STRING nt_name; ANSI_STRING unix_name; @@ -1693,6 +1694,8 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu return FALSE; } strcpyW( volumenameW, filename ); + /* forward slash backslash replace */ + for (fwdslash = volumenameW; *fwdslash; fwdslash++) if (*fwdslash == '/') *fwdslash = '\\'; stop_pos = 0; /* stop searching slashes early for NT-type and nearly NT-type paths */ if (strncmpW(ntprefixW, filename, strlenW(ntprefixW)) == 0) -- 2.11.0

2 3

[PATCH] ntdll: Fix the Fp and Lr registers in the CONTEXT struct for ARM64.
by Martin Storsjo 19 Mar '18

19 Mar '18

This seems to have been left inconsistent by accident in 21c12ddc64e88b67167267455bc5e68dc576cfa4. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- In case the difference was intentional, then this can obviously be ignored. --- dlls/dbghelp/cpu_arm64.c | 14 +++++++------- dlls/ntdll/signal_arm64.c | 20 ++++++++++---------- include/winnt.h | 6 +++--- programs/winedbg/be_arm64.c | 10 +++++----- programs/winedbg/gdbproxy.c | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index dd2ccfb..dea19f8 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -41,7 +41,7 @@ static BOOL arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, #ifdef __aarch64__ case cpu_addr_pc: addr->Offset = ctx->Pc; return TRUE; case cpu_addr_stack: addr->Offset = ctx->Sp; return TRUE; - case cpu_addr_frame: addr->Offset = ctx->Fp; return TRUE; + case cpu_addr_frame: addr->Offset = ctx->u.s.Fp; return TRUE; #endif default: addr->Mode = -1; return FALSE; @@ -69,7 +69,7 @@ static BOOL fetch_next_frame(struct cpu_stack_walk* csw, CONTEXT* context, DWORD_PTR curr_pc) { DWORD_PTR xframe; - DWORD_PTR oldReturn = context->Lr; + DWORD_PTR oldReturn = context->u.s.Lr; if (dwarf2_virtual_unwind(csw, curr_pc, context, &xframe)) { @@ -78,7 +78,7 @@ static BOOL fetch_next_frame(struct cpu_stack_walk* csw, return TRUE; } - if (context->Pc == context->Lr) return FALSE; + if (context->Pc == context->u.s.Lr) return FALSE; context->Pc = oldReturn; return TRUE; @@ -123,8 +123,8 @@ static BOOL arm64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, C /* set frame information */ frame->AddrStack.Offset = context->Sp; - frame->AddrReturn.Offset = context->Lr; - frame->AddrFrame.Offset = context->Fp; + frame->AddrReturn.Offset = context->u.s.Lr; + frame->AddrFrame.Offset = context->u.s.Fp; frame->AddrPC.Offset = context->Pc; frame->Far = TRUE; @@ -198,8 +198,8 @@ static void* arm64_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* siz case CV_ARM64_X0 + 27: case CV_ARM64_X0 + 28: *size = sizeof(ctx->u.X[0]); return &ctx->u.X[regno - CV_ARM64_X0]; case CV_ARM64_PSTATE: *size = sizeof(ctx->Cpsr); return &ctx->Cpsr; - case CV_ARM64_FP: *size = sizeof(ctx->Fp); return &ctx->Fp; - case CV_ARM64_LR: *size = sizeof(ctx->Lr); return &ctx->Lr; + case CV_ARM64_FP: *size = sizeof(ctx->u.s.Fp); return &ctx->u.s.Fp; + case CV_ARM64_LR: *size = sizeof(ctx->u.s.Lr); return &ctx->u.s.Lr; case CV_ARM64_SP: *size = sizeof(ctx->Sp); return &ctx->Sp; case CV_ARM64_PC: *size = sizeof(ctx->Pc); return &ctx->Pc; } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c461e88..def1071 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -123,8 +123,8 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) DWORD i; context->ContextFlags = CONTEXT_FULL; - context->Fp = FP_sig(sigcontext); /* Frame pointer */ - context->Lr = LR_sig(sigcontext); /* Link register */ + context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ + context->u.s.Lr = LR_sig(sigcontext); /* Link register */ context->Sp = SP_sig(sigcontext); /* Stack pointer */ context->Pc = PC_sig(sigcontext); /* Program Counter */ context->Cpsr = PSTATE_sig(sigcontext); /* Current State Register */ @@ -141,8 +141,8 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) { DWORD i; - FP_sig(sigcontext) = context->Fp; /* Frame pointer */ - LR_sig(sigcontext) = context->Lr; /* Link register */ + FP_sig(sigcontext) = context->u.s.Fp; /* Frame pointer */ + LR_sig(sigcontext) = context->u.s.Lr; /* Link register */ SP_sig(sigcontext) = context->Sp; /* Stack pointer */ PC_sig(sigcontext) = context->Pc; /* Program Counter */ PSTATE_sig(sigcontext) = context->Cpsr; /* Current State Register */ @@ -241,8 +241,8 @@ static void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) flags &= ~CONTEXT_ARM64; /* get rid of CPU id */ if (flags & CONTEXT_CONTROL) { - to->Fp = from->Fp; - to->Lr = from->Lr; + to->u.s.Fp = from->u.s.Fp; + to->u.s.Lr = from->u.s.Lr; to->Sp = from->Sp; to->Pc = from->Pc; to->Cpsr = from->Cpsr; @@ -281,8 +281,8 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) if (flags & CONTEXT_CONTROL) { to->flags |= SERVER_CTX_CONTROL; - to->integer.arm64_regs.x[29] = from->Fp; - to->integer.arm64_regs.x[30] = from->Lr; + to->integer.arm64_regs.x[29] = from->u.s.Fp; + to->integer.arm64_regs.x[30] = from->u.s.Lr; to->ctl.arm64_regs.sp = from->Sp; to->ctl.arm64_regs.pc = from->Pc; to->ctl.arm64_regs.pstate = from->Cpsr; @@ -326,8 +326,8 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) if (from->flags & SERVER_CTX_CONTROL) { to->ContextFlags |= CONTEXT_CONTROL; - to->Fp = from->integer.arm64_regs.x[29]; - to->Lr = from->integer.arm64_regs.x[30]; + to->u.s.Fp = from->integer.arm64_regs.x[29]; + to->u.s.Lr = from->integer.arm64_regs.x[30]; to->Sp = from->ctl.arm64_regs.sp; to->Pc = from->ctl.arm64_regs.pc; to->Cpsr = from->ctl.arm64_regs.pstate; diff --git a/include/winnt.h b/include/winnt.h index e602c1f..3c19af9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1850,12 +1850,12 @@ typedef struct _CONTEXT DWORD64 X26; /* 0d8 */ DWORD64 X27; /* 0e0 */ DWORD64 X28; /* 0e8 */ + DWORD64 Fp; /* 0f0 */ + DWORD64 Lr; /* 0f8 */ } DUMMYSTRUCTNAME; - DWORD64 X[29]; /* 008 */ + DWORD64 X[31]; /* 008 */ } DUMMYUNIONNAME; /* CONTEXT_CONTROL */ - DWORD64 Fp; /* 0f0 */ - DWORD64 Lr; /* 0f8 */ DWORD64 Sp; /* 100 */ DWORD64 Pc; /* 108 */ /* CONTEXT_FLOATING_POINT */ diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index b1952f6..dfeb552 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -32,7 +32,7 @@ static BOOL be_arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, case be_cpu_addr_stack: return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->Sp); case be_cpu_addr_frame: - return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->Fp); + return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->u.s.Fp); break; } return FALSE; @@ -81,7 +81,7 @@ static void be_arm64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_r buf[i] = '-'; dbg_printf(" Pc:%016lx Sp:%016lx Lr:%016lx Cpsr:%08x(%s)\n", - ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr, buf); + ctx->Pc, ctx->Sp, ctx->u.s.Lr, ctx->Cpsr, buf); dbg_printf(" x0: %016lx x1: %016lx x2: %016lx x3: %016lx x4: %016lx\n", ctx->u.s.X0, ctx->u.s.X1, ctx->u.s.X2, ctx->u.s.X3, ctx->u.s.X4); dbg_printf(" x5: %016lx x6: %016lx x7: %016lx x8: %016lx x9: %016lx\n", @@ -93,7 +93,7 @@ static void be_arm64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_r dbg_printf(" x20:%016lx x21:%016lx x22:%016lx x23:%016lx x24:%016lx\n", ctx->u.s.X20, ctx->u.s.X21, ctx->u.s.X22, ctx->u.s.X23, ctx->u.s.X24); dbg_printf(" x25:%016lx x26:%016lx x27:%016lx x28:%016lx Fp:%016lx\n", - ctx->u.s.X25, ctx->u.s.X26, ctx->u.s.X27, ctx->u.s.X28, ctx->Fp); + ctx->u.s.X25, ctx->u.s.X26, ctx->u.s.X27, ctx->u.s.X28, ctx->u.s.Fp); if (all_regs) dbg_printf( "Floating point ARM64 dump not implemented\n" ); } @@ -134,8 +134,8 @@ static struct dbg_internal_var be_arm64_ctx[] = {CV_ARM64_X0 + 26, "x26", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X26), dbg_itype_unsigned_long_int}, {CV_ARM64_X0 + 27, "x27", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X27), dbg_itype_unsigned_long_int}, {CV_ARM64_X0 + 28, "x28", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X28), dbg_itype_unsigned_long_int}, - {CV_ARM64_FP, "fp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Fp), dbg_itype_unsigned_long_int}, - {CV_ARM64_LR, "lr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Lr), dbg_itype_unsigned_long_int}, + {CV_ARM64_FP, "fp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Fp), dbg_itype_unsigned_long_int}, + {CV_ARM64_LR, "lr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Lr), dbg_itype_unsigned_long_int}, {CV_ARM64_SP, "sp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Sp), dbg_itype_unsigned_long_int}, {CV_ARM64_PC, "pc", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Pc), dbg_itype_unsigned_long_int}, {0, NULL, 0, dbg_itype_none} diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 618c5df..376bf37 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -495,8 +495,8 @@ static struct cpu_register cpu_register_map[] = { REG(u.s.X26, 8, CONTEXT_INTEGER), REG(u.s.X27, 8, CONTEXT_INTEGER), REG(u.s.X28, 8, CONTEXT_INTEGER), - REG(Fp, 8, CONTEXT_INTEGER), - REG(Lr, 8, CONTEXT_INTEGER), + REG(u.s.Fp, 8, CONTEXT_INTEGER), + REG(u.s.Lr, 8, CONTEXT_INTEGER), REG(Sp, 8, CONTEXT_CONTROL), REG(Pc, 8, CONTEXT_CONTROL), }; -- 2.7.4

2 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel