From b05c0919357aebb44967b89d98f8539667bd11d5 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 20 Mar 2018 10:57:56 +1100 Subject: [PATCH] Rebase against ae5d0b22291d866a49f293e782b43ba025ab77ec --- ...ypt-tests-Add-tests-for-AES-GCM-mode.patch | 263 ------------------ ...ct-to-get_-alg-hash-_property-instea.patch | 156 ----------- ...ent-BCryptSetProperty-for-algorithms.patch | 149 ---------- ...-BCryptGetProperty-for-BCRYPT_CHAINI.patch | 45 --- ...-BCryptGetProperty-for-BCRYPT_AUTH_T.patch | 76 ----- ...tring-comparison-in-set_alg_property.patch | 56 ---- ...revent-a-possible-nullpointer-derefe.patch | 28 -- ...licationActivationManager-interface-.patch | 17 +- patches/patchinstall.sh | 32 +-- ...icrosoft-Windows-Themes-directory-du.patch | 16 +- ...32-Correct-indentation-in-shfileop.c.patch | 231 ++++++++------- staging/VERSION | 2 +- 12 files changed, 147 insertions(+), 924 deletions(-) delete mode 100644 patches/bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch delete mode 100644 patches/bcrypt-Improvements/0012-bcrypt-Pass-object-to-get_-alg-hash-_property-instea.patch delete mode 100644 patches/bcrypt-Improvements/0013-bcrypt-Implement-BCryptSetProperty-for-algorithms.patch delete mode 100644 patches/bcrypt-Improvements/0014-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_CHAINI.patch delete mode 100644 patches/bcrypt-Improvements/0015-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_AUTH_T.patch delete mode 100644 patches/bcrypt-Improvements/0016-bcrypt-Fix-string-comparison-in-set_alg_property.patch delete mode 100644 patches/comctl32-Tests/0001-comctl32-tests-Prevent-a-possible-nullpointer-derefe.patch diff --git a/patches/bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch b/patches/bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch deleted file mode 100644 index 650261c8..00000000 --- a/patches/bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch +++ /dev/null @@ -1,263 +0,0 @@ -From 82785fee09e7d5cfce76ca4cc08291ecba19d393 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Mon, 26 Dec 2016 05:37:02 +0100 -Subject: [PATCH] bcrypt/tests: Add tests for AES GCM mode. - ---- - dlls/bcrypt/tests/bcrypt.c | 155 ++++++++++++++++++++++++++++++++++++++++++++- - include/bcrypt.h | 24 ++++++- - 2 files changed, 177 insertions(+), 2 deletions(-) - -diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c -index 6e28348..6cefe13 100644 ---- a/dlls/bcrypt/tests/bcrypt.c -+++ b/dlls/bcrypt/tests/bcrypt.c -@@ -564,6 +564,8 @@ 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}; - static UCHAR secret[] = - {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; - static UCHAR iv[] = -@@ -582,15 +584,28 @@ static void test_BCryptEncrypt(void) - {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79, - 0xb1,0xa2,0x92,0x73,0xbe,0x2c,0x42,0x07,0xa5,0xac,0xe3,0x93,0x39,0x8c,0xb6,0xfb, - 0x87,0x5d,0xea,0xa3,0x7e,0x0f,0xde,0xfa,0xd9,0xec,0x6c,0x4e,0x3c,0x76,0x86,0xe4}; -+ 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 expected_tag[] = -+ {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}; -+ BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; -+ UCHAR *buf, ciphertext[48], ivbuf[16], tag[16]; -+ BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length; - BCRYPT_ALG_HANDLE aes; - BCRYPT_KEY_HANDLE key; -- UCHAR *buf, ciphertext[48], ivbuf[16]; - ULONG size, len, i; - NTSTATUS ret; - - ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - -+ /****************** -+ * AES - CBC mode * -+ ******************/ -+ - len = 0xdeadbeef; - size = sizeof(len); - ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); -@@ -677,12 +692,101 @@ static void test_BCryptEncrypt(void) - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - HeapFree(GetProcessHeap(), 0, buf); - -+ /****************** -+ * AES - GCM mode * -+ ******************/ -+ -+ size = 0; -+ ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); -+ todo_wine 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); -+ todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -+ -+ size = 0; -+ ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); -+ todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -+ todo_wine 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); -+ todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -+ todo_wine ok(size == sizeof(tag_length), "got %u\n", size); -+ todo_wine ok(tag_length.dwMinLength == 12, "Expected 12, got %d\n", tag_length.dwMinLength); -+ todo_wine ok(tag_length.dwMaxLength == 16, "Expected 16, got %d\n", tag_length.dwMaxLength); -+ todo_wine ok(tag_length.dwIncrement == 1, "Expected 1, got %d\n", tag_length.dwIncrement); -+ -+ 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); -+ -+ memset(&auth_info, 0, sizeof(auth_info)); -+ auth_info.cbSize = sizeof(auth_info); -+ auth_info.dwInfoVersion = 1; -+ auth_info.pbNonce = nonce; -+ auth_info.cbNonce = sizeof(nonce); -+ auth_info.pbTag = tag; -+ auth_info.cbTag = sizeof(tag); -+ -+ /* input size is a multiple of block size */ -+ 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); -+ 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"); -+ 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]); -+ for (i = 0; i < 16; i++) -+ todo_wine 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)); -+ 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"); -+ 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]); -+ for (i = 0; i < 16; i++) -+ todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); -+ -+ /* test with padding */ -+ memcpy(ivbuf, iv, sizeof(iv)); -+ memset(ciphertext, 0, sizeof(ciphertext)); -+ ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); -+ todo_wine ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); -+ -+ 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); -+ -+ 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); - } - - static void test_BCryptDecrypt(void) - { -+ static UCHAR nonce[] = -+ {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60}; - static UCHAR secret[] = - {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; - static UCHAR iv[] = -@@ -704,6 +808,12 @@ static void test_BCryptDecrypt(void) - {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79, - 0xb1,0xa2,0x92,0x73,0xbe,0x2c,0x42,0x07,0xa5,0xac,0xe3,0x93,0x39,0x8c,0xb6,0xfb, - 0x87,0x5d,0xea,0xa3,0x7e,0x0f,0xde,0xfa,0xd9,0xec,0x6c,0x4e,0x3c,0x76,0x86,0xe4}; -+ 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 tag[] = -+ {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; -+ BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; - BCRYPT_KEY_LENGTHS_STRUCT key_lengths; - BCRYPT_ALG_HANDLE aes; - BCRYPT_KEY_HANDLE key; -@@ -723,6 +833,10 @@ static void test_BCryptDecrypt(void) - ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); - ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); - -+ /****************** -+ * AES - CBC mode * -+ ******************/ -+ - len = 0xdeadbeef; - size = sizeof(len); - ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); -@@ -820,6 +934,45 @@ static void test_BCryptDecrypt(void) - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - HeapFree(GetProcessHeap(), 0, buf); - -+ /****************** -+ * AES - GCM mode * -+ ******************/ -+ -+ ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); -+ todo_wine 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); -+ -+ memset(&auth_info, 0, sizeof(auth_info)); -+ auth_info.cbSize = sizeof(auth_info); -+ auth_info.dwInfoVersion = 1; -+ auth_info.pbNonce = nonce; -+ auth_info.cbNonce = sizeof(nonce); -+ auth_info.pbTag = tag; -+ auth_info.cbTag = sizeof(tag); -+ -+ /* input size is a multiple of block size */ -+ 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); -+ 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"); -+ -+ /* 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); -+ -+ 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); - } -diff --git a/include/bcrypt.h b/include/bcrypt.h -index 1be9b85..d0b29c7 100644 ---- a/include/bcrypt.h -+++ b/include/bcrypt.h -@@ -96,7 +96,29 @@ typedef struct __BCRYPT_KEY_LENGTHS_STRUCT - ULONG dwMinLength; - ULONG dwMaxLength; - ULONG dwIncrement; --} BCRYPT_KEY_LENGTHS_STRUCT; -+} BCRYPT_KEY_LENGTHS_STRUCT, BCRYPT_AUTH_TAG_LENGTHS_STRUCT; -+ -+typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO -+{ -+ ULONG cbSize; -+ ULONG dwInfoVersion; -+ UCHAR *pbNonce; -+ ULONG cbNonce; -+ UCHAR *pbAuthData; -+ ULONG cbAuthData; -+ UCHAR *pbTag; -+ ULONG cbTag; -+ UCHAR *pbMacContext; -+ ULONG cbMacContext; -+ ULONG cbAAD; -+ ULONGLONG cbData; -+ ULONG dwFlags; -+} BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO, *PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO; -+ -+#define BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_VERSION 1 -+ -+#define BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG 0x00000001 -+#define BCRYPT_AUTH_MODE_IN_PROGRESS_FLAG 0x00000002 - - typedef struct _CRYPT_INTERFACE_REG - { --- -1.9.1 - diff --git a/patches/bcrypt-Improvements/0012-bcrypt-Pass-object-to-get_-alg-hash-_property-instea.patch b/patches/bcrypt-Improvements/0012-bcrypt-Pass-object-to-get_-alg-hash-_property-instea.patch deleted file mode 100644 index 67106cda..00000000 --- a/patches/bcrypt-Improvements/0012-bcrypt-Pass-object-to-get_-alg-hash-_property-instea.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 2d4fc0dc7d0c64fb45683af54d659832493e2a7e Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Mon, 26 Dec 2016 06:18:01 +0100 -Subject: [PATCH 12/36] bcrypt: Pass object to get_{alg,hash}_property instead - of alg_id. - ---- - dlls/bcrypt/bcrypt_main.c | 40 ++++++++++++++++++++-------------------- - 1 file changed, 20 insertions(+), 20 deletions(-) - -diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c -index 6e47349..8af43c8 100644 ---- a/dlls/bcrypt/bcrypt_main.c -+++ b/dlls/bcrypt/bcrypt_main.c -@@ -510,15 +510,15 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * - return STATUS_NOT_IMPLEMENTED; - } - --static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) -+static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) - { - NTSTATUS status; - -- status = generic_alg_property( id, prop, buf, size, ret_size ); -+ status = generic_alg_property( alg->id, prop, buf, size, ret_size ); - if (status != STATUS_NOT_IMPLEMENTED) - return status; - -- switch (id) -+ switch (alg->id) - { - case ALG_ID_AES: - if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) -@@ -567,11 +567,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, - return STATUS_NOT_IMPLEMENTED; - } - --static NTSTATUS get_hash_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) -+static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) - { - NTSTATUS status; - -- status = generic_alg_property( id, prop, buf, size, ret_size ); -+ status = generic_alg_property( hash->alg_id, prop, buf, size, ret_size ); - if (status == STATUS_NOT_IMPLEMENTED) - FIXME( "unsupported property %s\n", debugstr_w(prop) ); - return status; -@@ -591,12 +591,12 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu - case MAGIC_ALG: - { - const struct algorithm *alg = (const struct algorithm *)object; -- return get_alg_property( alg->id, prop, buffer, count, res ); -+ return get_alg_property( alg, prop, buffer, count, res ); - } - case MAGIC_HASH: - { - const struct hash *hash = (const struct hash *)object; -- return get_hash_property( hash->alg_id, prop, buffer, count, res ); -+ return get_hash_property( hash, prop, buffer, count, res ); - } - default: - WARN( "unknown magic %08x\n", object->magic ); -@@ -798,7 +798,7 @@ struct key - #endif - - #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 --static ULONG get_block_size( enum alg_id alg ) -+static ULONG get_block_size( struct algorithm *alg ) - { - ULONG ret = 0, size = sizeof(ret); - get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); -@@ -827,27 +827,27 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U - #endif - - #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) --static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) -+static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) - { - UCHAR *buffer; - - if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; - -- switch (id) -+ switch (alg->id) - { - case ALG_ID_AES: - break; - - default: -- FIXME( "algorithm %u not supported\n", id ); -+ FIXME( "algorithm %u not supported\n", alg->id ); - return STATUS_NOT_SUPPORTED; - } - -- if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; -+ if (!(key->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 = id; -+ key->alg_id = alg->id; - key->handle = 0; /* initialized on first use */ - key->secret = buffer; - key->secret_len = secret_len; -@@ -937,25 +937,25 @@ static NTSTATUS key_destroy( struct key *key ) - return STATUS_SUCCESS; - } - #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 --static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) -+static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) - { - UCHAR *buffer; - -- switch (id) -+ switch (alg->id) - { - case ALG_ID_AES: - break; - - default: -- FIXME( "algorithm %u not supported\n", id ); -+ FIXME( "algorithm %u not supported\n", alg->id ); - return STATUS_NOT_SUPPORTED; - } - -- if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; -+ if (!(key->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 = id; -+ key->alg_id = alg->id; - key->ref_encrypt = NULL; /* initialized on first use */ - key->ref_decrypt = NULL; - key->secret = buffer; -@@ -1034,7 +1034,7 @@ static NTSTATUS key_destroy( struct key *key ) - return STATUS_SUCCESS; - } - #else --static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) -+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" ); - return STATUS_NOT_IMPLEMENTED; -@@ -1089,7 +1089,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->id, secret, secret_len ))) -+ if ((status = key_init( key, alg, secret, secret_len ))) - { - heap_free( key ); - return status; --- -2.7.4 - diff --git a/patches/bcrypt-Improvements/0013-bcrypt-Implement-BCryptSetProperty-for-algorithms.patch b/patches/bcrypt-Improvements/0013-bcrypt-Implement-BCryptSetProperty-for-algorithms.patch deleted file mode 100644 index 26cb2abc..00000000 --- a/patches/bcrypt-Improvements/0013-bcrypt-Implement-BCryptSetProperty-for-algorithms.patch +++ /dev/null @@ -1,149 +0,0 @@ -From d0252a03c82c8b3c3e6bb8bed0007e844b10301c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Mon, 26 Dec 2016 06:08:33 +0100 -Subject: [PATCH 13/36] bcrypt: Implement BCryptSetProperty for algorithms. - ---- - dlls/bcrypt/bcrypt_main.c | 66 ++++++++++++++++++++++++++++++++++++++++++++-- - dlls/bcrypt/tests/bcrypt.c | 6 ++--- - 2 files changed, 67 insertions(+), 5 deletions(-) - -diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c -index 73a5c36fed..cbf7576860 100644 ---- a/dlls/bcrypt/bcrypt_main.c -+++ b/dlls/bcrypt/bcrypt_main.c -@@ -192,6 +192,12 @@ enum alg_id - ALG_ID_SHA512 - }; - -+enum mode_id -+{ -+ MODE_ID_CBC, -+ MODE_ID_GCM -+}; -+ - #define MAX_HASH_OUTPUT_BYTES 64 - #define MAX_HASH_BLOCK_BITS 1024 - -@@ -216,6 +222,7 @@ struct algorithm - { - struct object hdr; - enum alg_id id; -+ enum mode_id mode; - BOOL hmac; - }; - -@@ -298,6 +305,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR - if (!(alg = heap_alloc( sizeof(*alg) ))) return STATUS_NO_MEMORY; - alg->hdr.magic = MAGIC_ALG; - alg->id = alg_id; -+ alg->mode = MODE_ID_CBC; - alg->hmac = flags & BCRYPT_ALG_HANDLE_HMAC_FLAG; - - *handle = alg; -@@ -567,6 +575,40 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop - return STATUS_NOT_IMPLEMENTED; - } - -+static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -+{ -+ switch (alg->id) -+ { -+ case ALG_ID_AES: -+ if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) -+ { -+ if (size == sizeof(BCRYPT_CHAIN_MODE_CBC) && -+ !strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) -+ { -+ alg->mode = MODE_ID_CBC; -+ return STATUS_SUCCESS; -+ } -+ else if (size == sizeof(BCRYPT_CHAIN_MODE_GCM) && -+ !strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) -+ { -+ alg->mode = MODE_ID_GCM; -+ return STATUS_SUCCESS; -+ } -+ else -+ { -+ FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); -+ return STATUS_NOT_IMPLEMENTED; -+ } -+ } -+ FIXME( "unsupported aes algorithm property %s\n", debugstr_w(prop) ); -+ return STATUS_NOT_IMPLEMENTED; -+ -+ default: -+ FIXME( "unsupported algorithm %u\n", alg->id ); -+ return STATUS_NOT_IMPLEMENTED; -+ } -+} -+ - static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) - { - NTSTATUS status; -@@ -606,8 +648,28 @@ 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 ) - { -- FIXME( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); -- return STATUS_NOT_IMPLEMENTED; -+ 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, -diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c -index 6cefe13226..75c25d0929 100644 ---- a/dlls/bcrypt/tests/bcrypt.c -+++ b/dlls/bcrypt/tests/bcrypt.c -@@ -512,7 +512,7 @@ static void test_BCryptGenerateSymmetricKey(void) - - ret = pBCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, - sizeof(BCRYPT_CHAIN_MODE_CBC), 0); -- todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -+ ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - - size = 0xdeadbeef; - ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); -@@ -701,7 +701,7 @@ static void test_BCryptEncrypt(void) - todo_wine 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); -- todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -+ ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - - size = 0; - ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); -@@ -939,7 +939,7 @@ static void test_BCryptDecrypt(void) - ******************/ - - ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); -- todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -+ 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); --- -2.16.1 - diff --git a/patches/bcrypt-Improvements/0014-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_CHAINI.patch b/patches/bcrypt-Improvements/0014-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_CHAINI.patch deleted file mode 100644 index 4c034d3b..00000000 --- a/patches/bcrypt-Improvements/0014-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_CHAINI.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6aa0794091b1ea7ef5f4bf686d4b7fbcab12d213 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Mon, 26 Dec 2016 06:46:11 +0100 -Subject: [PATCH 14/36] bcrypt: Implement BCryptGetProperty for - BCRYPT_CHAINING_MODE. - ---- - dlls/bcrypt/bcrypt_main.c | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c -index cbf7576860..186e619d5f 100644 ---- a/dlls/bcrypt/bcrypt_main.c -+++ b/dlls/bcrypt/bcrypt_main.c -@@ -540,17 +540,18 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop - } - if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) - { -- if (size >= sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR)) -+ const WCHAR *mode; -+ switch (alg->mode) - { -- memcpy(buf, BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC)); -- *ret_size = sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR); -- return STATUS_SUCCESS; -- } -- else -- { -- *ret_size = sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR); -- return STATUS_BUFFER_TOO_SMALL; -+ case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; -+ case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; -+ default: return STATUS_NOT_IMPLEMENTED; - } -+ -+ *ret_size = 64; -+ if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; -+ memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) ); -+ return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) - { --- -2.16.1 - diff --git a/patches/bcrypt-Improvements/0015-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_AUTH_T.patch b/patches/bcrypt-Improvements/0015-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_AUTH_T.patch deleted file mode 100644 index de7a1547..00000000 --- a/patches/bcrypt-Improvements/0015-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_AUTH_T.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 35d3ff46ea1c10f5c3d78ff4ea3abd91a6778bf0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Mon, 26 Dec 2016 06:50:28 +0100 -Subject: [PATCH 15/36] bcrypt: Implement BCryptGetProperty for - BCRYPT_AUTH_TAG_LENGTH. - ---- - dlls/bcrypt/bcrypt_main.c | 14 ++++++++++++++ - dlls/bcrypt/tests/bcrypt.c | 16 ++++++++-------- - 2 files changed, 22 insertions(+), 8 deletions(-) - -diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c -index 186e619d5f..47ed8e0533 100644 ---- a/dlls/bcrypt/bcrypt_main.c -+++ b/dlls/bcrypt/bcrypt_main.c -@@ -566,6 +566,20 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop - } - return STATUS_SUCCESS; - } -+ if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) -+ { -+ BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; -+ if (alg->mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; -+ *ret_size = sizeof(*tag_length); -+ if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; -+ if (tag_length) -+ { -+ tag_length->dwMinLength = 12; -+ tag_length->dwMaxLength = 16; -+ tag_length->dwIncrement = 1; -+ } -+ return STATUS_SUCCESS; -+ } - break; - - default: -diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c -index 75c25d0929..27feabb5f4 100644 ---- a/dlls/bcrypt/tests/bcrypt.c -+++ b/dlls/bcrypt/tests/bcrypt.c -@@ -698,24 +698,24 @@ static void test_BCryptEncrypt(void) - - size = 0; - ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); -- todo_wine ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); -+ 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); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - - size = 0; - ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); -- todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- todo_wine ok(size == sizeof(tag_length), "got %u\n", size); -+ 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); -- todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- todo_wine ok(size == sizeof(tag_length), "got %u\n", size); -- todo_wine ok(tag_length.dwMinLength == 12, "Expected 12, got %d\n", tag_length.dwMinLength); -- todo_wine ok(tag_length.dwMaxLength == 16, "Expected 16, got %d\n", tag_length.dwMaxLength); -- todo_wine ok(tag_length.dwIncrement == 1, "Expected 1, got %d\n", tag_length.dwIncrement); -+ 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); -+ ok(tag_length.dwMaxLength == 16, "Expected 16, got %d\n", tag_length.dwMaxLength); -+ ok(tag_length.dwIncrement == 1, "Expected 1, got %d\n", tag_length.dwIncrement); - - len = 0xdeadbeef; - size = sizeof(len); --- -2.16.1 - diff --git a/patches/bcrypt-Improvements/0016-bcrypt-Fix-string-comparison-in-set_alg_property.patch b/patches/bcrypt-Improvements/0016-bcrypt-Fix-string-comparison-in-set_alg_property.patch deleted file mode 100644 index 9114f27c..00000000 --- a/patches/bcrypt-Improvements/0016-bcrypt-Fix-string-comparison-in-set_alg_property.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 8959d51b23f1f001670662ea19bd5b65ed477719 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Mon, 26 Dec 2016 07:21:27 +0100 -Subject: [PATCH 16/36] bcrypt: Fix string comparison in set_alg_property. - ---- - dlls/bcrypt/bcrypt_main.c | 6 ++---- - dlls/bcrypt/tests/bcrypt.c | 11 +++++++++++ - 2 files changed, 13 insertions(+), 4 deletions(-) - -diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c -index 47ed8e0533..9e9e357634 100644 ---- a/dlls/bcrypt/bcrypt_main.c -+++ b/dlls/bcrypt/bcrypt_main.c -@@ -597,14 +597,12 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA - case ALG_ID_AES: - if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) - { -- if (size == sizeof(BCRYPT_CHAIN_MODE_CBC) && -- !strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) -+ if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) - { - alg->mode = MODE_ID_CBC; - return STATUS_SUCCESS; - } -- else if (size == sizeof(BCRYPT_CHAIN_MODE_GCM) && -- !strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) -+ else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) - { - alg->mode = MODE_ID_GCM; - return STATUS_SUCCESS; -diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c -index 27feabb5f4..70d9e0c246 100644 ---- a/dlls/bcrypt/tests/bcrypt.c -+++ b/dlls/bcrypt/tests/bcrypt.c -@@ -475,6 +475,17 @@ static void test_aes(void) - ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); - ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); - -+ memcpy(mode, BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM)); -+ ret = pBCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), 0); -+ ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -+ -+ size = 0; -+ memset(mode, 0, sizeof(mode)); -+ ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); -+ ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -+ ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", mode); -+ ok(size == 64, "got %u\n", size); -+ - test_alg_name(alg, "AES"); - - ret = pBCryptCloseAlgorithmProvider(alg, 0); --- -2.16.1 - diff --git a/patches/comctl32-Tests/0001-comctl32-tests-Prevent-a-possible-nullpointer-derefe.patch b/patches/comctl32-Tests/0001-comctl32-tests-Prevent-a-possible-nullpointer-derefe.patch deleted file mode 100644 index bd1d8c99..00000000 --- a/patches/comctl32-Tests/0001-comctl32-tests-Prevent-a-possible-nullpointer-derefe.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d18171f54de2c85d345a76586bd4672929cdbdb3 Mon Sep 17 00:00:00 2001 -From: Mark Jansen -Date: Sun, 11 Jun 2017 12:58:28 +0200 -Subject: comctl32/tests: Prevent a possible nullpointer dereference. - ---- - dlls/comctl32/tests/imagelist.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c -index 20be1ea02f2..0978b3d69d3 100644 ---- a/dlls/comctl32/tests/imagelist.c -+++ b/dlls/comctl32/tests/imagelist.c -@@ -2042,9 +2042,9 @@ static void check_color_table(const char *name, HDC hdc, HIMAGELIST himl, UINT i - ok((bmi->bmiColors[i].rgbRed == expect[i].rgbRed && - bmi->bmiColors[i].rgbGreen == expect[i].rgbGreen && - bmi->bmiColors[i].rgbBlue == expect[i].rgbBlue) || -- broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed && -+ (broken_expect && broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed && - bmi->bmiColors[i].rgbGreen == broken_expect[i].rgbGreen && -- bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue), -+ bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue)), - "%d: %s: got color[%d] %02x %02x %02x expect %02x %02x %02x\n", depth, name, i, - bmi->bmiColors[i].rgbRed, bmi->bmiColors[i].rgbGreen, bmi->bmiColors[i].rgbBlue, - expect[i].rgbRed, expect[i].rgbGreen, expect[i].rgbBlue); --- -2.13.1 - diff --git a/patches/ntdll-RtlQueryPackageIdentity/0002-include-Add-IApplicationActivationManager-interface-.patch b/patches/ntdll-RtlQueryPackageIdentity/0002-include-Add-IApplicationActivationManager-interface-.patch index 1a3655fb..1d30cdcb 100644 --- a/patches/ntdll-RtlQueryPackageIdentity/0002-include-Add-IApplicationActivationManager-interface-.patch +++ b/patches/ntdll-RtlQueryPackageIdentity/0002-include-Add-IApplicationActivationManager-interface-.patch @@ -1,19 +1,20 @@ -From 730defc94816ecb8e67f79f4bbee7cf31bedfec1 Mon Sep 17 00:00:00 2001 +From 9fa84d2a82ae2444f6fbe995cf1dbbf2003e6ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 00:46:34 +0100 -Subject: include: Add IApplicationActivationManager interface declaration. +Subject: [PATCH] include: Add IApplicationActivationManager interface + declaration. --- include/shobjidl.idl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl -index 1cc6132..cf9b8b3 100644 +index e0fe01c..9d3b676 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl -@@ -3639,6 +3639,34 @@ typedef enum ASSOC_FILTER - } ASSOC_FILTER; - cpp_quote("HRESULT WINAPI SHAssocEnumHandlers(PCWSTR extra, ASSOC_FILTER filter, IEnumAssocHandlers **handlersenum);") +@@ -3713,6 +3713,34 @@ interface IItemNameLimits : IUnknown + [out] int *max_length); + } +typedef [v1_enum] enum ACTIVATEOPTIONS +{ @@ -46,7 +47,7 @@ index 1cc6132..cf9b8b3 100644 /***************************************************************************** * ShellObjects typelibrary */ -@@ -3735,4 +3763,12 @@ library ShellObjects +@@ -3817,4 +3845,12 @@ library ShellObjects { interface IQueryCancelAutoPlay; } @@ -60,5 +61,5 @@ index 1cc6132..cf9b8b3 100644 + } } -- -2.6.4 +1.9.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 67b5f9c9..2090ecf9 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,13 +52,13 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "afe4f54bb439cfa26ca72968cec2da357ea8836e" + echo "ae5d0b22291d866a49f293e782b43ba025ab77ec" } # Show version information version() { - echo "Wine Staging 3.4" + echo "Wine Staging 3.5 (unreleased)" echo "Copyright (C) 2014-2018 the Wine Staging project authors." echo "Copyright (C) 2018 Alistair Leslie-Hughes" echo "" @@ -103,7 +103,6 @@ patch_enable_all () enable_browseui_Progress_Dialog="$1" enable_combase_RoApi="$1" enable_comctl32_Listview_DrawItem="$1" - enable_comctl32_Tests="$1" enable_comdlg32_lpstrFileTitle="$1" enable_configure_Absolute_RPATH="$1" enable_crypt32_CMS_Certificates="$1" @@ -525,9 +524,6 @@ patch_enable () comctl32-Listview_DrawItem) enable_comctl32_Listview_DrawItem="$2" ;; - comctl32-Tests) - enable_comctl32_Tests="$2" - ;; comdlg32-lpstrFileTitle) enable_comdlg32_lpstrFileTitle="$2" ;; @@ -3053,12 +3049,6 @@ fi # | include/bcrypt.h # | if test "$enable_bcrypt_Improvements" -eq 1; then - patch_apply bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch - patch_apply bcrypt-Improvements/0012-bcrypt-Pass-object-to-get_-alg-hash-_property-instea.patch - patch_apply bcrypt-Improvements/0013-bcrypt-Implement-BCryptSetProperty-for-algorithms.patch - patch_apply bcrypt-Improvements/0014-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_CHAINI.patch - patch_apply bcrypt-Improvements/0015-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_AUTH_T.patch - patch_apply bcrypt-Improvements/0016-bcrypt-Fix-string-comparison-in-set_alg_property.patch patch_apply bcrypt-Improvements/0017-bcrypt-Implement-BCryptEncrypt-for-AES-GCM-mode.patch patch_apply bcrypt-Improvements/0018-bcrypt-Implement-BCryptDecrypt-for-AES-GCM-mode.patch patch_apply bcrypt-Improvements/0019-bcrypt-Add-support-for-computing-comparing-cipher-ta.patch @@ -3080,12 +3070,6 @@ if test "$enable_bcrypt_Improvements" -eq 1; then patch_apply bcrypt-Improvements/0036-bcrypt-tests-Add-simple-test-for-RSA.patch patch_apply bcrypt-Improvements/0037-bcrypt-Store-full-ECCKEY_BLOB-struct-in-BCryptImport.patch ( - printf '%s\n' '+ { "Michael Müller", "bcrypt/tests: Add tests for AES GCM mode.", 1 },'; - printf '%s\n' '+ { "Sebastian Lackner", "bcrypt: Pass object to get_{alg,hash}_property instead of alg_id.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "bcrypt: Implement BCryptSetProperty for algorithms.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "bcrypt: Implement BCryptGetProperty for BCRYPT_CHAINING_MODE.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "bcrypt: Implement BCryptGetProperty for BCRYPT_AUTH_TAG_LENGTH.", 1 },'; - printf '%s\n' '+ { "Sebastian Lackner", "bcrypt: Fix string comparison in set_alg_property.", 1 },'; printf '%s\n' '+ { "Michael Müller", "bcrypt: Implement BCryptEncrypt for AES GCM mode.", 1 },'; printf '%s\n' '+ { "Michael Müller", "bcrypt: Implement BCryptDecrypt for AES GCM mode.", 1 },'; printf '%s\n' '+ { "Michael Müller", "bcrypt: Add support for computing/comparing cipher tag.", 1 },'; @@ -3138,18 +3122,6 @@ if test "$enable_comctl32_Listview_DrawItem" -eq 1; then ) >> "$patchlist" fi -# Patchset comctl32-Tests -# | -# | Modified files: -# | * dlls/comctl32/tests/imagelist.c -# | -if test "$enable_comctl32_Tests" -eq 1; then - patch_apply comctl32-Tests/0001-comctl32-tests-Prevent-a-possible-nullpointer-derefe.patch - ( - printf '%s\n' '+ { "Mark Jansen", "comctl32/tests: Prevent a possible nullpointer dereference.", 1 },'; - ) >> "$patchlist" -fi - # Patchset comdlg32-lpstrFileTitle # | # | This patchset fixes the following Wine bugs: diff --git a/patches/shell32-Microsoft_Windows_Themes/0001-shell32-Create-Microsoft-Windows-Themes-directory-du.patch b/patches/shell32-Microsoft_Windows_Themes/0001-shell32-Create-Microsoft-Windows-Themes-directory-du.patch index 51801fee..39bc8a00 100644 --- a/patches/shell32-Microsoft_Windows_Themes/0001-shell32-Create-Microsoft-Windows-Themes-directory-du.patch +++ b/patches/shell32-Microsoft_Windows_Themes/0001-shell32-Create-Microsoft-Windows-Themes-directory-du.patch @@ -1,15 +1,15 @@ -From 8ac8c40269c0b6f3784b429ebdd301b43f60aaef Mon Sep 17 00:00:00 2001 +From f3cfd0b818d3dd45034a4ba90fb3cd170b8fd32e Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 3 Sep 2015 04:56:23 +0200 -Subject: shell32: Create Microsoft\Windows\Themes directory during Wineprefix - creation. +Subject: [PATCH] shell32: Create Microsoft\Windows\Themes directory during + Wineprefix creation. --- dlls/shell32/shellpath.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c -index c5ba6295cda..374f0fa4d61 100644 +index e14f533..bd07574 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -857,6 +857,7 @@ static const WCHAR Microsoft_Windows_Start_Menu_Admin_ToolsW[] = {'M','i','c','r @@ -20,7 +20,7 @@ index c5ba6295cda..374f0fa4d61 100644 static const WCHAR MoviesW[] = {'M','o','v','i','e','s','\0'}; static const WCHAR MusicW[] = {'M','u','s','i','c','\0'}; static const WCHAR MusicLibraryW[] = {'M','u','s','i','c','L','i','b','r','a','r','y',0}; -@@ -4265,6 +4266,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) +@@ -4267,6 +4268,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) }; WCHAR userShellFolderPath[MAX_PATH], shellFolderPath[MAX_PATH]; LPCWSTR pUserShellFolderPath, pShellFolderPath; @@ -28,10 +28,10 @@ index c5ba6295cda..374f0fa4d61 100644 HRESULT hr = S_OK; HKEY hRootKey; HANDLE hToken; -@@ -4293,6 +4295,13 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) +@@ -4295,6 +4297,13 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) hr = _SHRegisterFolders(hRootKey, hToken, pUserShellFolderPath, - pShellFolderPath, folders, sizeof(folders) / sizeof(folders[0])); + pShellFolderPath, folders, ARRAY_SIZE(folders)); + + if (SUCCEEDED(hr)) + { @@ -43,5 +43,5 @@ index c5ba6295cda..374f0fa4d61 100644 return hr; } -- -2.14.1 +1.9.1 diff --git a/patches/shell32-Progress_Dialog/0001-shell32-Correct-indentation-in-shfileop.c.patch b/patches/shell32-Progress_Dialog/0001-shell32-Correct-indentation-in-shfileop.c.patch index 7d412125..b4d12e6c 100644 --- a/patches/shell32-Progress_Dialog/0001-shell32-Correct-indentation-in-shfileop.c.patch +++ b/patches/shell32-Progress_Dialog/0001-shell32-Correct-indentation-in-shfileop.c.patch @@ -1,26 +1,17 @@ -From 60b2a9f4bbbda5675491ae323b97fdcc84dacc4f Mon Sep 17 00:00:00 2001 +From d606011cab7ce44de90b6945796deee86bacba44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 24 Feb 2015 04:25:29 +0100 Subject: [PATCH] shell32: Correct indentation in shfileop.c. --- - dlls/shell32/shlfileop.c | 726 +++++++++++++++++++++++------------------------ - 1 file changed, 363 insertions(+), 363 deletions(-) + dlls/shell32/shlfileop.c | 787 +++++++++++++++++++++++------------------------ + 1 file changed, 393 insertions(+), 394 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c -index c18a3e9..91d5781 100644 +index 117d668..975106a 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c -@@ -165,7 +165,7 @@ static INT_PTR ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam) - width = r.right - r.left; - height = r.bottom - r.top - yOffset; - MoveWindow(hDlg, (GetSystemMetrics(SM_CXSCREEN) - width)/2, -- (GetSystemMetrics(SM_CYSCREEN) - height)/2, width, height, FALSE); -+ (GetSystemMetrics(SM_CYSCREEN) - height)/2, width, height, FALSE); - - confirm_msg_move_button(hDlg, IDCANCEL, &xPos, yOffset, info->bYesToAll); - confirm_msg_move_button(hDlg, IDNO, &xPos, yOffset, TRUE); -@@ -207,107 +207,107 @@ static int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, H +@@ -207,108 +207,107 @@ static int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, H /* confirmation dialogs content */ typedef struct { @@ -37,84 +28,111 @@ index c18a3e9..91d5781 100644 - ids->hIconInstance = shell32_hInstance; - switch (nKindOfDialog) { - case ASK_DELETE_FILE: -+ ids->hIconInstance = shell32_hInstance; -+ switch (nKindOfDialog) { -+ case ASK_DELETE_FILE: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; +- ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETEITEM_TEXT; - return TRUE; - case ASK_DELETE_FOLDER: -+ ids->caption_resource_id = IDS_DELETEITEM_CAPTION; -+ ids->text_resource_id = IDS_DELETEITEM_TEXT; -+ return TRUE; -+ case ASK_DELETE_FOLDER: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; +- ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; - ids->text_resource_id = IDS_DELETEITEM_TEXT; - return TRUE; - case ASK_DELETE_MULTIPLE_ITEM: -+ ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; -+ ids->text_resource_id = IDS_DELETEITEM_TEXT; -+ return TRUE; -+ case ASK_DELETE_MULTIPLE_ITEM: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; +- ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT; - return TRUE; - case ASK_TRASH_FILE: -+ ids->caption_resource_id = IDS_DELETEITEM_CAPTION; -+ ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT; -+ return TRUE; -+ case ASK_TRASH_FILE: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_TRASHITEM_TEXT; - return TRUE; +- ids->icon_resource_id = IDI_SHELL_TRASH_FILE; +- ids->caption_resource_id = IDS_DELETEITEM_CAPTION; +- ids->text_resource_id = IDS_TRASHITEM_TEXT; +- return TRUE; - case ASK_TRASH_FOLDER: -+ case ASK_TRASH_FOLDER: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; - ids->text_resource_id = IDS_TRASHFOLDER_TEXT; - return TRUE; +- ids->icon_resource_id = IDI_SHELL_TRASH_FILE; +- ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; +- ids->text_resource_id = IDS_TRASHFOLDER_TEXT; +- return TRUE; - case ASK_TRASH_MULTIPLE_ITEM: -+ case ASK_TRASH_MULTIPLE_ITEM: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_TRASHMULTIPLE_TEXT; - return TRUE; +- ids->icon_resource_id = IDI_SHELL_TRASH_FILE; +- ids->caption_resource_id = IDS_DELETEITEM_CAPTION; +- ids->text_resource_id = IDS_TRASHMULTIPLE_TEXT; +- return TRUE; - case ASK_CANT_TRASH_ITEM: -+ case ASK_CANT_TRASH_ITEM: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_CANTTRASH_TEXT; - return TRUE; +- ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; +- ids->caption_resource_id = IDS_DELETEITEM_CAPTION; +- ids->text_resource_id = IDS_CANTTRASH_TEXT; +- return TRUE; - case ASK_DELETE_SELECTED: -+ case ASK_DELETE_SELECTED: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; +- ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ++ ids->hIconInstance = shell32_hInstance; ++ switch (nKindOfDialog) { ++ case ASK_DELETE_FILE: ++ ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETESELECTED_TEXT; +- ids->text_resource_id = IDS_DELETESELECTED_TEXT; ++ ids->text_resource_id = IDS_DELETEITEM_TEXT; return TRUE; - case ASK_OVERWRITE_FILE: -+ case ASK_OVERWRITE_FILE: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_WARNING; +- ids->hIconInstance = NULL; +- ids->icon_resource_id = IDI_WARNING; - ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; - ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; -+ ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; -+ ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; ++ case ASK_DELETE_FOLDER: ++ ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ++ ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; ++ ids->text_resource_id = IDS_DELETEITEM_TEXT; return TRUE; - case ASK_OVERWRITE_FOLDER: -+ case ASK_OVERWRITE_FOLDER: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_WARNING; - ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; - ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; +- ids->hIconInstance = NULL; +- ids->icon_resource_id = IDI_WARNING; +- ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; +- ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; ++ case ASK_DELETE_MULTIPLE_ITEM: ++ ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ++ ids->caption_resource_id = IDS_DELETEITEM_CAPTION; ++ ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT; return TRUE; - default: - FIXME(" Unhandled nKindOfDialog %d stub\n", nKindOfDialog); - } - return FALSE; ++ case ASK_TRASH_FILE: ++ ids->icon_resource_id = IDI_SHELL_TRASH_FILE; ++ ids->caption_resource_id = IDS_DELETEITEM_CAPTION; ++ ids->text_resource_id = IDS_TRASHITEM_TEXT; ++ return TRUE; ++ case ASK_TRASH_FOLDER: ++ ids->icon_resource_id = IDI_SHELL_TRASH_FILE; ++ ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; ++ ids->text_resource_id = IDS_TRASHFOLDER_TEXT; ++ return TRUE; ++ case ASK_TRASH_MULTIPLE_ITEM: ++ ids->icon_resource_id = IDI_SHELL_TRASH_FILE; ++ ids->caption_resource_id = IDS_DELETEITEM_CAPTION; ++ ids->text_resource_id = IDS_TRASHMULTIPLE_TEXT; ++ return TRUE; ++ case ASK_CANT_TRASH_ITEM: ++ ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ++ ids->caption_resource_id = IDS_DELETEITEM_CAPTION; ++ ids->text_resource_id = IDS_CANTTRASH_TEXT; ++ return TRUE; ++ case ASK_DELETE_SELECTED: ++ ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ++ ids->caption_resource_id = IDS_DELETEITEM_CAPTION; ++ ids->text_resource_id = IDS_DELETESELECTED_TEXT; ++ return TRUE; ++ case ASK_OVERWRITE_FILE: ++ ids->hIconInstance = NULL; ++ ids->icon_resource_id = IDI_WARNING; ++ ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; ++ ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; ++ return TRUE; ++ case ASK_OVERWRITE_FOLDER: ++ ids->hIconInstance = NULL; ++ ids->icon_resource_id = IDI_WARNING; ++ ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; ++ ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; ++ return TRUE; + default: + FIXME(" Unhandled nKindOfDialog %d stub\n", nKindOfDialog); + } @@ -132,28 +150,23 @@ index c18a3e9..91d5781 100644 - assert(nKindOfDialog >= 0 && nKindOfDialog < 32); - if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) - return TRUE; +- +- if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; +- +- LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, ARRAY_SIZE(szCaption)); +- LoadStringW(shell32_hInstance, ids.text_resource_id, szText, ARRAY_SIZE(szText)); +- +- args[0] = (DWORD_PTR)szDir; +- FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, +- szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (__ms_va_list*)args); +- +- hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); + WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256]; + SHELL_ConfirmIDstruc ids; + DWORD_PTR args[1]; + HICON hIcon; + int ret; -- if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; -+ assert(nKindOfDialog >= 0 && nKindOfDialog < 32); -+ if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) -+ return TRUE; - -- LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR)); -- LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR)); -+ if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; - -- args[0] = (DWORD_PTR)szDir; -- FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, -- szText, 0, 0, szBuffer, sizeof(szBuffer)/sizeof(szBuffer[0]), (__ms_va_list*)args); -- hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); -+ LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR)); -+ LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR)); - - ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); - if (op) { - if (ret == IDD_YESTOALL) { @@ -164,9 +177,20 @@ index c18a3e9..91d5781 100644 - op->bCancelled = TRUE; - if (ret != IDYES) - op->req->fAnyOperationsAborted = TRUE; +- } +- return ret == IDYES; ++ assert(nKindOfDialog >= 0 && nKindOfDialog < 32); ++ if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) ++ return TRUE; ++ ++ if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; ++ ++ LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, ARRAY_SIZE(szCaption)); ++ LoadStringW(shell32_hInstance, ids.text_resource_id, szText, ARRAY_SIZE(szText)); ++ + args[0] = (DWORD_PTR)szDir; + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, -+ szText, 0, 0, szBuffer, sizeof(szBuffer)/sizeof(szBuffer[0]), (__ms_va_list*)args); ++ szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (__ms_va_list*)args); + hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); + + ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); @@ -174,8 +198,7 @@ index c18a3e9..91d5781 100644 + if (ret == IDD_YESTOALL) { + op->dwYesToAllMask |= (1 << nKindOfDialog); + ret = IDYES; - } -- return ret == IDYES; ++ } + if (ret == IDCANCEL) + op->bCancelled = TRUE; + if (ret != IDYES) @@ -185,7 +208,7 @@ index c18a3e9..91d5781 100644 } BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) -@@ -317,18 +317,18 @@ BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) +@@ -318,18 +317,18 @@ BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) static DWORD SHELL32_AnsiToUnicodeBuf(LPCSTR aPath, LPWSTR *wPath, DWORD minChars) { @@ -216,7 +239,7 @@ index c18a3e9..91d5781 100644 } HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) -@@ -371,8 +371,8 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) +@@ -372,8 +371,8 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) ret = SHNotifyRemoveDirectoryW(pszDir); return ret == ERROR_PATH_NOT_FOUND ? @@ -227,7 +250,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************** -@@ -392,41 +392,41 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) +@@ -393,41 +392,41 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) */ static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec) { @@ -292,7 +315,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************ -@@ -446,51 +446,51 @@ BOOL WINAPI Win32CreateDirectoryAW(LPCVOID path, LPSECURITY_ATTRIBUTES sec) +@@ -447,51 +446,51 @@ BOOL WINAPI Win32CreateDirectoryAW(LPCVOID path, LPSECURITY_ATTRIBUTES sec) */ static DWORD SHNotifyRemoveDirectoryA(LPCSTR path) { @@ -377,7 +400,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************ -@@ -510,52 +510,52 @@ BOOL WINAPI Win32RemoveDirectoryAW(LPCVOID path) +@@ -511,52 +510,52 @@ BOOL WINAPI Win32RemoveDirectoryAW(LPCVOID path) */ static DWORD SHNotifyDeleteFileA(LPCSTR path) { @@ -464,7 +487,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************ -@@ -572,36 +572,36 @@ DWORD WINAPI Win32DeleteFileAW(LPCVOID path) +@@ -573,36 +572,36 @@ DWORD WINAPI Win32DeleteFileAW(LPCVOID path) */ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) { @@ -531,7 +554,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************ -@@ -620,24 +620,24 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) +@@ -621,24 +620,24 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) */ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) { @@ -570,7 +593,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************* -@@ -667,9 +667,9 @@ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) +@@ -668,9 +667,9 @@ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) */ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path) { @@ -583,7 +606,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************* -@@ -706,18 +706,18 @@ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path) +@@ -707,18 +706,18 @@ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path) */ int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES sec) { @@ -614,7 +637,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************* -@@ -727,49 +727,49 @@ int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES se +@@ -728,49 +727,49 @@ int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES se */ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES sec) { @@ -707,7 +730,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************* -@@ -789,25 +789,25 @@ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES s +@@ -790,25 +789,25 @@ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES s */ static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) { @@ -752,7 +775,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************* -@@ -821,27 +821,27 @@ static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) +@@ -822,27 +821,27 @@ static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) */ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) { @@ -801,7 +824,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************* * SHFileOperationA [SHELL32.@] -@@ -861,42 +861,42 @@ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) +@@ -862,42 +861,42 @@ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) */ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) { @@ -880,7 +903,7 @@ index c18a3e9..91d5781 100644 } #define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026 -@@ -926,7 +926,7 @@ typedef struct +@@ -927,7 +926,7 @@ typedef struct static inline void grow_list(FILE_LIST *list) { FILE_ENTRY *new = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list->feFiles, @@ -889,7 +912,7 @@ index c18a3e9..91d5781 100644 list->feFiles = new; list->num_alloc *= 2; } -@@ -1018,7 +1018,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) +@@ -1019,7 +1018,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) /* empty list */ if (!szFiles[0]) return ERROR_ACCESS_DENIED; @@ -898,7 +921,7 @@ index c18a3e9..91d5781 100644 flList->feFiles = heap_alloc_zero(flList->num_alloc * sizeof(FILE_ENTRY)); while (*ptr) -@@ -1121,7 +1121,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST +@@ -1122,7 +1121,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST /* Don't ask the user about overwriting files when he accepted to overwrite the folder. FIXME: this is not exactly what Windows does - e.g. there would be an additional confirmation for a nested folder */ @@ -907,7 +930,7 @@ index c18a3e9..91d5781 100644 SHFileOperationW(&fileOp); } -@@ -1334,7 +1334,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +@@ -1335,7 +1334,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) /* Windows also checks only the first item */ bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO) @@ -916,7 +939,7 @@ index c18a3e9..91d5781 100644 if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING)) if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom)) -@@ -1369,11 +1369,11 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +@@ -1370,11 +1369,11 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) break; } } @@ -930,7 +953,7 @@ index c18a3e9..91d5781 100644 else ret = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); -@@ -1498,8 +1498,8 @@ static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con +@@ -1499,8 +1498,8 @@ static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con static void check_flags(FILEOP_FLAGS fFlags) { WORD wUnsupportedFlags = FOF_NO_CONNECTED_ELEMENTS | @@ -941,7 +964,7 @@ index c18a3e9..91d5781 100644 if (fFlags & wUnsupportedFlags) FIXME("Unsupported flags: %04x\n", fFlags); -@@ -1582,19 +1582,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) +@@ -1583,19 +1582,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) */ void WINAPI SHFreeNameMappings(HANDLE hNameMapping) { @@ -971,7 +994,7 @@ index c18a3e9..91d5781 100644 } /************************************************************************* -@@ -1700,14 +1700,14 @@ DWORD WINAPI SheChangeDirW(LPWSTR path) +@@ -1701,14 +1700,14 @@ DWORD WINAPI SheChangeDirW(LPWSTR path) } /************************************************************************* diff --git a/staging/VERSION b/staging/VERSION index c3f8e3db..5a21465f 100644 --- a/staging/VERSION +++ b/staging/VERSION @@ -1 +1 @@ -Wine Staging 3.4 +Wine Staging 3.5 (unreleased)