- wine-devel - winehq.org

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

19 Mar '18

Version 2: Incorporates improvements suggested by Huw; split patches up further. 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

3 2

[PATCH 3/3] comctl32/datetime: Implement DTM_GETIDEALSIZE message.
by Zhiyi Zhang 19 Mar '18

19 Mar '18

Fix https://bugs.winehq.org/show_bug.cgi?id=44680 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/datetime.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/datetime.c | 41 +++++++++++++++++++++++++++++++ include/commctrl.h | 2 ++ 3 files changed, 98 insertions(+)

2 1

[PATCH 2/3] comctl32/datetime: Fix length passed to GetLocaleInfoW().
by Zhiyi Zhang 19 Mar '18

19 Mar '18

This fix fullday not being rendered when long date format is used. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/datetime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 1/3] comctl32/datetime: Fix wrong format for DTS_SHORTDATECENTURYFORMAT.
by Zhiyi Zhang 19 Mar '18

19 Mar '18

DTS_SHORTDATECENTURYFORMAT should use short date format Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/datetime.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

2 1

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

19 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(-)

3 2

[PATCH 5/5] bcrypt: Implement BCryptGetProperty for BCRYPT_AUTH_TAG_LENGTH.
by Alistair Leslie-Hughes 19 Mar '18

19 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 | 16 ++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 55901f9..fa80318 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 b8eaf22..fbfb6d3 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -709,24 +709,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); -- 1.9.1

2 1

[PATCH 4/5] bcrypt: Implement BCryptGetProperty for BCRYPT_CHAINING_MODE.
by Alistair Leslie-Hughes 19 Mar '18

19 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 | 19 ++++++++++--------- dlls/bcrypt/tests/bcrypt.c | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2f56604..55901f9 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 )) { diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index c44626c..b8eaf22 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -483,7 +483,7 @@ static void test_aes(void) memset(mode, 0, sizeof(mode)); ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", wine_dbgstr_w(mode)); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", wine_dbgstr_w(mode)); ok(size == 64, "got %u\n", size); test_alg_name(alg, "AES"); -- 1.9.1

2 1

[PATCH 3/5] bcrypt: Implement BCryptSetProperty for algorithms.
by Alistair Leslie-Hughes 19 Mar '18

19 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 | 64 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/bcrypt/tests/bcrypt.c | 17 +++++++++--- 2 files changed, 76 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 8af43c8..2f56604 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,38 @@ 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 (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + { + alg->mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else if (!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 +646,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 6cefe13..c44626c 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); + todo_wine ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", wine_dbgstr_w(mode)); + ok(size == 64, "got %u\n", size); + test_alg_name(alg, "AES"); ret = pBCryptCloseAlgorithmProvider(alg, 0); @@ -512,7 +523,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 +712,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 +950,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); -- 1.9.1

2 1

[PATCH 2/5] bcrypt: Pass object to get_{alg, hash}_property instead of alg_id.
by Alistair Leslie-Hughes 19 Mar '18

19 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 | 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; -- 1.9.1

2 1

[PATCH 1/5] bcrypt/tests: Add tests for AES GCM mode.
by Alistair Leslie-Hughes 19 Mar '18

19 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 | 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

2 1

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

19 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 | 65 +++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi_internal.h | 24 ++++++++++++++++ 4 files changed, 104 insertions(+), 26 deletions(-) create mode 100644 dlls/wsdapi/soap.c

2 1

[PATCH] shell32/tests: Add a basic test for SHLimitInputEdit()
by Nikolay Sivov 19 Mar '18

19 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/tests/shlfolder.c | 29 +++++++++++++++++++++++++++++ include/shlobj.h | 1 + include/shobjidl.idl | 14 ++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1b140c0501..95ebb92e5c 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5217,6 +5217,34 @@ static void test_GetDefaultSearchGUID(void) CoUninitialize(); } +static void test_SHLimitInputEdit(void) +{ + IShellFolder *desktop; + HRESULT hr; + HWND hwnd; + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "Failed to get desktop folder, hr %#x.\n", hr); + + hr = SHLimitInputEdit(NULL, desktop); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hwnd = CreateWindowA("EDIT", NULL, WS_VISIBLE, 0, 0, 100, 30, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "Failed to create Edit control.\n"); + + hr = SHLimitInputEdit(hwnd, desktop); +todo_wine + ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); + + hr = SHLimitInputEdit(hwnd, desktop); +todo_wine + ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); + + DestroyWindow(hwnd); + IShellFolder_Release(desktop); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5258,6 +5286,7 @@ START_TEST(shlfolder) test_DataObject(); test_GetDefaultColumn(); test_GetDefaultSearchGUID(); + test_SHLimitInputEdit(); OleUninitialize(); } diff --git a/include/shlobj.h b/include/shlobj.h index 09efc18ee5..7cdb4f873d 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1801,6 +1801,7 @@ HRESULT WINAPI CDefFolderMenu_Create2(LPCITEMIDLIST pidlFolder, HWND hwnd, UINT IContextMenu **ppcm); int WINAPI PickIconDlg(HWND owner, WCHAR *path, UINT path_len, int *index); +HRESULT WINAPI SHLimitInputEdit(HWND hwnd, IShellFolder *folder); #include <poppack.h> diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 5e4da5de28..e0fe01c2c1 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3699,6 +3699,20 @@ typedef enum ASSOC_FILTER } ASSOC_FILTER; cpp_quote("HRESULT WINAPI SHAssocEnumHandlers(PCWSTR extra, ASSOC_FILTER filter, IEnumAssocHandlers **handlersenum);") +[ + uuid(1df0d7f1-b267-4d28-8b10-12e23202a5c4), +] +interface IItemNameLimits : IUnknown +{ + HRESULT GetValidCharacters( + [out, string] LPWSTR *validchars, + [out, string] LPWSTR *invalidchars); + + HRESULT GetMaxLength( + [in, string] LPCWSTR name, + [out] int *max_length); +} + /***************************************************************************** * ShellObjects typelibrary */ -- 2.16.2

2 1

[PATCH] shell32: Use ARRAY_SIZE macro
by Nikolay Sivov 19 Mar '18

19 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/assoc.c | 2 +- dlls/shell32/autocomplete.c | 2 +- dlls/shell32/brsfolder.c | 6 ++---- dlls/shell32/classes.c | 2 +- dlls/shell32/control.c | 34 +++++++++++++---------------- dlls/shell32/dde.c | 2 +- dlls/shell32/dialogs.c | 4 ++-- dlls/shell32/recyclebin.c | 18 ++++++---------- dlls/shell32/shell32_main.c | 6 +++--- dlls/shell32/shell32_main.h | 2 ++ dlls/shell32/shelldispatch.c | 2 +- dlls/shell32/shelllink.c | 13 +++++------- dlls/shell32/shellole.c | 4 ++-- dlls/shell32/shellord.c | 8 +++---- dlls/shell32/shellpath.c | 47 ++++++++++++++++++++++------------------- dlls/shell32/shfldr_desktop.c | 16 ++++++-------- dlls/shell32/shfldr_fs.c | 10 ++++----- dlls/shell32/shfldr_netplaces.c | 9 +++----- dlls/shell32/shfldr_unixfs.c | 10 ++++----- dlls/shell32/shlexec.c | 16 +++++++------- dlls/shell32/shlfileop.c | 11 +++++----- dlls/shell32/shlmenu.c | 2 +- dlls/shell32/shlview.c | 2 +- dlls/shell32/systray.c | 11 +++++----- dlls/shell32/xdg.c | 6 ++---- 25 files changed, 114 insertions(+), 131 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index a9eb70e933..d3f20c225b 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -676,7 +676,7 @@ get_friendly_name_fail: case ASSOCSTR_SHELLEXTENSION: { static const WCHAR shellexW[] = {'S','h','e','l','l','E','x','\\',0}; - WCHAR keypath[sizeof(shellexW) / sizeof(shellexW[0]) + 39], guid[39]; + WCHAR keypath[ARRAY_SIZE(shellexW) + 39], guid[39]; CLSID clsid; HKEY hkey; DWORD size; diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b411c1b675..99ce23d040 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -123,7 +123,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, { int len; - GetWindowTextW( hwnd, hwndText, sizeof(hwndText)/sizeof(WCHAR)); + GetWindowTextW(hwnd, hwndText, ARRAY_SIZE(hwndText)); switch(wParam) { case VK_RETURN: diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index fc7b5b6b74..daddf1e9ec 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -82,8 +82,6 @@ static const LAYOUT_INFO g_layout_info[] = {IDCANCEL, BF_BOTTOM|BF_RIGHT} }; -#define LAYOUT_INFO_COUNT (sizeof(g_layout_info)/sizeof(g_layout_info[0])) - #define SUPPORTEDFLAGS (BIF_STATUSTEXT | \ BIF_BROWSEFORCOMPUTER | \ BIF_RETURNFSANCESTORS | \ @@ -667,7 +665,7 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) { RECT rcWnd; - info->layout = LayoutInit(hWnd, g_layout_info, LAYOUT_INFO_COUNT); + info->layout = LayoutInit(hWnd, g_layout_info, ARRAY_SIZE(g_layout_info)); /* TODO: Windows allows shrinking the windows a bit */ GetWindowRect(hWnd, &rcWnd); @@ -1012,7 +1010,7 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, case WM_SIZE: if (info->layout) /* new style dialogs */ - LayoutUpdate(hWnd, info->layout, g_layout_info, LAYOUT_INFO_COUNT); + LayoutUpdate(hWnd, info->layout, g_layout_info, ARRAY_SIZE(g_layout_info)); return 0; case BFFM_SETSTATUSTEXTA: diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 316abd53f5..653b55179e 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -187,7 +187,7 @@ BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LP return FALSE; ret = FALSE; - if (HCR_GetDefaultVerbW(hkeyClass, szVerb, sTempVerb, sizeof(sTempVerb)/sizeof(sTempVerb[0]))) + if (HCR_GetDefaultVerbW(hkeyClass, szVerb, sTempVerb, ARRAY_SIZE(sTempVerb))) { WCHAR sTemp[MAX_PATH]; lstrcpyW(sTemp, swShell); diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 66fbf17954..6b86214bd8 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -124,10 +124,10 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) applet->info[i].icon = LoadIconW(applet->hModule, MAKEINTRESOURCEW(info.idIcon)); if (info.idName != CPL_DYNAMIC_RES) LoadStringW(applet->hModule, info.idName, - applet->info[i].name, sizeof(applet->info[i].name) / sizeof(WCHAR)); + applet->info[i].name, ARRAY_SIZE(applet->info[i].name)); if (info.idInfo != CPL_DYNAMIC_RES) LoadStringW(applet->hModule, info.idInfo, - applet->info[i].info, sizeof(applet->info[i].info) / sizeof(WCHAR)); + applet->info[i].info, ARRAY_SIZE(applet->info[i].info)); /* some broken control panels seem to return incorrect values in CPL_INQUIRE, but proper data in CPL_NEWINQUIRE. if we get an empty string or a null @@ -159,18 +159,16 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) memcpy(applet->info[i].info, newinfo.szInfo, sizeof(newinfo.szInfo)); memcpy(applet->info[i].helpfile, newinfo.szHelpFile, sizeof(newinfo.szHelpFile)); } else { + NEWCPLINFOA *infoA = (NEWCPLINFOA *)&newinfo; + if (info.idName == CPL_DYNAMIC_RES) - MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szName, - sizeof(((LPNEWCPLINFOA)&newinfo)->szName) / sizeof(CHAR), - applet->info[i].name, sizeof(applet->info[i].name) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, infoA->szName, ARRAY_SIZE(infoA->szName), + applet->info[i].name, ARRAY_SIZE(applet->info[i].name)); if (info.idInfo == CPL_DYNAMIC_RES) - MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szInfo, - sizeof(((LPNEWCPLINFOA)&newinfo)->szInfo) / sizeof(CHAR), - applet->info[i].info, sizeof(applet->info[i].info) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szHelpFile, - sizeof(((LPNEWCPLINFOA)&newinfo)->szHelpFile) / sizeof(CHAR), - applet->info[i].helpfile, - sizeof(applet->info[i].helpfile) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, infoA->szInfo, ARRAY_SIZE(infoA->szInfo), + applet->info[i].info, ARRAY_SIZE(applet->info[i].info)); + MultiByteToWideChar(CP_ACP, 0, infoA->szHelpFile, ARRAY_SIZE(infoA->szHelpFile), + applet->info[i].helpfile, ARRAY_SIZE(applet->info[i].helpfile)); } } } @@ -229,7 +227,7 @@ static BOOL Control_CreateListView (CPanel *panel) /* Name column */ lvc.iSubItem = 0; lvc.cx = (ws.right - ws.left) / 3; - LoadStringW(shell32_hInstance, IDS_CPANEL_NAME, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(shell32_hInstance, IDS_CPANEL_NAME, buf, ARRAY_SIZE(buf)); if (ListView_InsertColumnW(panel->hWndListView, 0, &lvc) == -1) return FALSE; @@ -237,8 +235,7 @@ static BOOL Control_CreateListView (CPanel *panel) /* Description column */ lvc.iSubItem = 1; lvc.cx = ((ws.right - ws.left) / 3) * 2; - LoadStringW(shell32_hInstance, IDS_CPANEL_DESCRIPTION, buf, sizeof(buf) / - sizeof(buf[0])); + LoadStringW(shell32_hInstance, IDS_CPANEL_DESCRIPTION, buf, ARRAY_SIZE(buf)); if (ListView_InsertColumnW(panel->hWndListView, 1, &lvc) == -1) return FALSE; @@ -300,7 +297,7 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) mii.cbSize = sizeof(MENUITEMINFOW); mii.fMask = MIIM_ID | MIIM_STRING | MIIM_DATA; mii.dwTypeData = applet->info[i].name; - mii.cch = sizeof(applet->info[i].name) / sizeof(WCHAR); + mii.cch = ARRAY_SIZE(applet->info[i].name); mii.wID = IDM_CPANEL_APPLET_BASE + menucount; mii.dwItemData = (ULONG_PTR)item; @@ -475,8 +472,7 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, HICON icon = LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL), IMAGE_ICON, 48, 48, LR_SHARED); - LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, - sizeof(appName) / sizeof(appName[0])); + LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, ARRAY_SIZE(appName)); ShellAboutW(hWnd, appName, NULL, icon); return 0; @@ -616,7 +612,7 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) MSG msg; WCHAR appName[MAX_STRING_LEN]; - LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, sizeof(appName) / sizeof(appName[0])); + LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, ARRAY_SIZE(appName)); wc.cbSize = sizeof(wc); wc.style = CS_HREDRAW|CS_VREDRAW; diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 0283a45760..c54fe7854f 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -50,7 +50,7 @@ static DWORD dwDDEInst; static const char *debugstr_hsz( HSZ hsz ) { WCHAR buffer[256]; - if (!DdeQueryStringW( dwDDEInst, hsz, buffer, sizeof(buffer)/sizeof(WCHAR), CP_WINUNICODE )) + if (!DdeQueryStringW( dwDDEInst, hsz, buffer, ARRAY_SIZE(buffer), CP_WINUNICODE )) return "<unknown>"; return debugstr_w( buffer ); } diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 48321364d0..c6d8e95e96 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -499,8 +499,8 @@ static BOOL ConfirmDialog(HWND hWndOwner, UINT PromptId, UINT TitleId) WCHAR Prompt[256]; WCHAR Title[256]; - LoadStringW(shell32_hInstance, PromptId, Prompt, sizeof(Prompt) / sizeof(WCHAR)); - LoadStringW(shell32_hInstance, TitleId, Title, sizeof(Title) / sizeof(WCHAR)); + LoadStringW(shell32_hInstance, PromptId, Prompt, ARRAY_SIZE(Prompt)); + LoadStringW(shell32_hInstance, TitleId, Title, ARRAY_SIZE(Title)); return MessageBoxW(hWndOwner, Prompt, Title, MB_YESNO|MB_ICONQUESTION) == IDYES; } diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 5d4725e425..0d80e6376d 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -200,13 +200,10 @@ static void DoRestore(RecycleBinMenu *This) WCHAR message[100]; WCHAR caption[50]; if(_ILIsFolder(ILFindLastID(dest_pidl))) - LoadStringW(shell32_hInstance,IDS_RECYCLEBIN_OVERWRITEFOLDER, - message,sizeof(message)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_OVERWRITEFOLDER, message, ARRAY_SIZE(message)); else - LoadStringW(shell32_hInstance,IDS_RECYCLEBIN_OVERWRITEFILE, - message,sizeof(message)/sizeof(WCHAR)); - LoadStringW(shell32_hInstance,IDS_RECYCLEBIN_OVERWRITE_CAPTION, - caption,sizeof(caption)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_OVERWRITEFILE, message, ARRAY_SIZE(message)); + LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_OVERWRITE_CAPTION, caption, ARRAY_SIZE(caption)); if(ShellMessageBoxW(shell32_hInstance,GetActiveWindow(),message, caption,MB_YESNO|MB_ICONEXCLAMATION, @@ -788,22 +785,19 @@ static HRESULT erase_items(HWND parent,const LPCITEMIDLIST * apidl, UINT cidl, B WIN32_FIND_DATAW data; TRASH_UnpackItemID(&((*apidl)->mkid),&data); lstrcpynW(arg,data.cFileName,MAX_PATH); - LoadStringW(shell32_hInstance,IDS_RECYCLEBIN_ERASEITEM,message, - sizeof(message)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_ERASEITEM, message, ARRAY_SIZE(message)); break; } default: { static const WCHAR format[]={'%','u','\0'}; - LoadStringW(shell32_hInstance,IDS_RECYCLEBIN_ERASEMULTIPLE, - message,sizeof(message)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_ERASEMULTIPLE, message, ARRAY_SIZE(message)); sprintfW(arg,format,cidl); break; } } - LoadStringW(shell32_hInstance,IDS_RECYCLEBIN_ERASE_CAPTION,caption, - sizeof(caption)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_ERASE_CAPTION, caption, ARRAY_SIZE(caption)); if(ShellMessageBoxW(shell32_hInstance,parent,message,caption, MB_YESNO|MB_ICONEXCLAMATION,arg)!=IDYES) return ret; diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index dd0f6e71de..525eba4544 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1075,15 +1075,15 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, if (info) { SendDlgItemMessageW(hWnd, stc1, STM_SETICON,(WPARAM)info->hIcon, 0); - GetWindowTextW( hWnd, template, sizeof(template)/sizeof(WCHAR) ); + GetWindowTextW( hWnd, template, ARRAY_SIZE(template) ); sprintfW( buffer, template, info->szApp ); SetWindowTextW( hWnd, buffer ); SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT1), info->szApp ); SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT2), info->szOtherStuff ); GetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT3), - template, sizeof(template)/sizeof(WCHAR) ); + template, ARRAY_SIZE(template) ); MultiByteToWideChar( CP_UTF8, 0, wine_get_build_id(), -1, - version, sizeof(version)/sizeof(WCHAR) ); + version, ARRAY_SIZE(template) ); sprintfW( buffer, template, version ); SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT3), buffer ); hWndCtl = GetDlgItem(hWnd, IDC_ABOUT_LISTBOX); diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 11a96309e8..d1b0e01cf1 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -39,6 +39,8 @@ #include "wine/unicode.h" #include "wine/list.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + /******************************************* * global SHELL32.DLL variables */ diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 66635547ed..2835fad712 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -155,7 +155,7 @@ void release_typelib(void) if (!typelib) return; - for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if (typeinfos[i]) ITypeInfo_Release(typeinfos[i]); diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index ba04c8e288..e6774719b9 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -307,7 +307,7 @@ BOOL run_winemenubuilder( const WCHAR *args ) WCHAR app[MAX_PATH]; void *redir; - GetSystemDirectoryW( app, MAX_PATH - sizeof(menubuilder)/sizeof(WCHAR) ); + GetSystemDirectoryW( app, MAX_PATH - ARRAY_SIZE(menubuilder) ); strcatW( app, menubuilder ); len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); @@ -588,7 +588,7 @@ static HRESULT Stream_ReadChunk( IStream* stm, LPVOID *data ) static BOOL Stream_LoadVolume( LOCAL_VOLUME_INFO *vol, volume_info *volume ) { - const int label_sz = sizeof volume->label/sizeof volume->label[0]; + const int label_sz = ARRAY_SIZE(volume->label); LPSTR label; int len; @@ -782,14 +782,11 @@ static HRESULT WINAPI IPersistStream_fnLoad( if (TRACE_ON(shell)) { WCHAR sTemp[MAX_PATH]; - GetDateFormatW(LOCALE_USER_DEFAULT,DATE_SHORTDATE, &This->time1, - NULL, sTemp, sizeof(sTemp)/sizeof(*sTemp)); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->time1, NULL, sTemp, ARRAY_SIZE(sTemp)); TRACE("-- time1: %s\n", debugstr_w(sTemp) ); - GetDateFormatW(LOCALE_USER_DEFAULT,DATE_SHORTDATE, &This->time2, - NULL, sTemp, sizeof(sTemp)/sizeof(*sTemp)); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->time2, NULL, sTemp, ARRAY_SIZE(sTemp)); TRACE("-- time2: %s\n", debugstr_w(sTemp) ); - GetDateFormatW(LOCALE_USER_DEFAULT,DATE_SHORTDATE, &This->time3, - NULL, sTemp, sizeof(sTemp)/sizeof(*sTemp)); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->time3, NULL, sTemp, ARRAY_SIZE(sTemp)); TRACE("-- time3: %s\n", debugstr_w(sTemp) ); } diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index c79242199b..3fe96801aa 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -150,7 +150,7 @@ HRESULT WINAPI SHCoCreateInstance( } /* we look up the dll path in the registry */ - SHStringFromGUIDW(myclsid, sClassID, sizeof(sClassID)/sizeof(WCHAR)); + SHStringFromGUIDW(myclsid, sClassID, ARRAY_SIZE(sClassID)); lstrcpyW(sKeyName, sCLSID); lstrcatW(sKeyName, sClassID); lstrcatW(sKeyName, sInProcServer32); @@ -258,7 +258,7 @@ DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id) { WCHAR buffer[40]; TRACE("(%p(%s) %p)\n", clsid, clsid, id); - if (!MultiByteToWideChar( CP_ACP, 0, clsid, -1, buffer, sizeof(buffer)/sizeof(WCHAR) )) + if (!MultiByteToWideChar( CP_ACP, 0, clsid, -1, buffer, ARRAY_SIZE(buffer) )) return CO_E_CLASSSTRING; return CLSIDFromString( buffer, id ); } diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 6bf29a1fbd..058e57e5b5 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -433,12 +433,12 @@ int WINAPIV ShellMessageBoxW( hInstance,hWnd,lpText,lpCaption,uType); if (IS_INTRESOURCE(lpCaption)) - LoadStringW(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)/sizeof(szTitle[0])); + LoadStringW(hInstance, LOWORD(lpCaption), szTitle, ARRAY_SIZE(szTitle)); else pszTitle = lpCaption; if (IS_INTRESOURCE(lpText)) - LoadStringW(hInstance, LOWORD(lpText), szText, sizeof(szText)/sizeof(szText[0])); + LoadStringW(hInstance, LOWORD(lpText), szText, ARRAY_SIZE(szText)); else pszText = lpText; @@ -1774,7 +1774,7 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_ dwIndex = 0; do { - dwHandlerLen = sizeof(szHandler) / sizeof(szHandler[0]); + dwHandlerLen = ARRAY_SIZE(szHandler); lRet = RegEnumKeyExW(hkPropSheetHandlers, dwIndex++, szHandler, &dwHandlerLen, NULL, NULL, NULL, NULL); if (lRet != ERROR_SUCCESS) { @@ -1793,7 +1793,7 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_ if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS) { /* Force a NULL-termination and convert the string */ - szClsidHandler[(sizeof(szClsidHandler) / sizeof(szClsidHandler[0])) - 1] = 0; + szClsidHandler[ARRAY_SIZE(szClsidHandler) - 1] = 0; lRet = SHCLSIDFromStringW(szClsidHandler, &clsid); } } diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index fdd9c4087a..e14f533bb9 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3421,8 +3421,9 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath) TRACE("0x%02x,%p\n", folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; + if (!pszPath) return E_INVALIDARG; @@ -3508,7 +3509,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if (CSIDL_Data[folder].type != CSIDL_Type_CurrVer) return E_INVALIDARG; @@ -3612,7 +3613,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, TRACE("%p,0x%08x,0x%02x,%p\n", hToken, dwFlags, folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if (CSIDL_Data[folder].type != CSIDL_Type_User) return E_INVALIDARG; @@ -3684,7 +3685,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder, TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath); - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if (CSIDL_Data[folder].type != CSIDL_Type_AllUsers && CSIDL_Data[folder].type != CSIDL_Type_ProgramData) return E_INVALIDARG; @@ -3997,7 +3998,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( if (pszPath) *pszPath = '\0'; - if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; if ((SHGFP_TYPE_CURRENT != dwFlags) && (SHGFP_TYPE_DEFAULT != dwFlags)) return E_INVALIDARG; @@ -4293,7 +4294,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) } hr = _SHRegisterFolders(hRootKey, hToken, pUserShellFolderPath, - pShellFolderPath, folders, sizeof(folders) / sizeof(folders[0])); + pShellFolderPath, folders, ARRAY_SIZE(folders)); TRACE("returning 0x%08x\n", hr); return hr; } @@ -4318,7 +4319,7 @@ static HRESULT _SHRegisterCommonShellFolders(void) TRACE("\n"); hr = _SHRegisterFolders(HKEY_LOCAL_MACHINE, NULL, szSHUserFolders, - szSHFolders, folders, sizeof(folders) / sizeof(folders[0])); + szSHFolders, folders, ARRAY_SIZE(folders)); TRACE("returning 0x%08x\n", hr); return hr; } @@ -4411,7 +4412,7 @@ static void _SHCreateSymbolicLinks(void) const WCHAR* MyOSXStuffW[] = { PicturesW, MoviesW, MusicW }; int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DOCUMENTS", "DESKTOP" }; - static const unsigned int num = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]); + static const unsigned int num = ARRAY_SIZE(xdg_dirs); WCHAR wszTempPath[MAX_PATH]; char szPersonalTarget[FILENAME_MAX], *pszPersonal; char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; @@ -4446,7 +4447,7 @@ static void _SHCreateSymbolicLinks(void) * 'My Videos' and 'My Music' subfolders or fail silently if * they already exist. */ - for (i = 0; i < sizeof(aidsMyStuff)/sizeof(*aidsMyStuff); i++) + for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { strcpy(szMyStuffTarget, szPersonalTarget); if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) @@ -4486,7 +4487,7 @@ static void _SHCreateSymbolicLinks(void) * in '%USERPROFILE%\\My Documents' or fail silently if they already exist. */ pszHome = NULL; strcpy(szPersonalTarget, pszPersonal); - for (i = 0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { + for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { strcpy(szMyStuffTarget, szPersonalTarget); if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) mkdir(szMyStuffTarget, 0777); @@ -4494,7 +4495,7 @@ static void _SHCreateSymbolicLinks(void) } /* Create symbolic links for 'My Pictures', 'My Videos' and 'My Music'. */ - for (i=0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) + for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) { /* Create the current 'My Whatever' folder and get its unix path. */ hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, @@ -4655,11 +4656,11 @@ static HRESULT set_folder_attributes(void) }; unsigned int i; - WCHAR buffer[39 + (sizeof(clsidW) + sizeof(shellfolderW)) / sizeof(WCHAR)]; + WCHAR buffer[39 + ARRAY_SIZE(clsidW) + ARRAY_SIZE(shellfolderW)]; LONG res; HKEY hkey; - for (i = 0; i < sizeof(folders)/sizeof(folders[0]); i++) + for (i = 0; i < ARRAY_SIZE(folders); i++) { strcpyW( buffer, clsidW ); StringFromGUID2( folders[i].clsid, buffer + strlenW(buffer), 39 ); @@ -4855,7 +4856,7 @@ HRESULT WINAPI SHGetSpecialFolderLocation( static int csidl_from_id( const KNOWNFOLDERID *id ) { int i; - for (i = 0; i < sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]); i++) + for (i = 0; i < ARRAY_SIZE(CSIDL_Data); i++) if (IsEqualGUID( CSIDL_Data[i].id, id )) return i; return -1; } @@ -5049,7 +5050,7 @@ static HRESULT get_known_folder_registry_path( TRACE("(%s, %s, %p)\n", debugstr_guid(rfid), debugstr_w(lpStringGuid), lpPath); if(rfid) - StringFromGUID2(rfid, sGuid, sizeof(sGuid)/sizeof(sGuid[0])); + StringFromGUID2(rfid, sGuid, ARRAY_SIZE(sGuid)); else lstrcpyW(sGuid, lpStringGuid); @@ -5178,7 +5179,7 @@ static HRESULT redirect_known_folder( if(SUCCEEDED(hr)) { - StringFromGUID2(rfid, sGuid, sizeof(sGuid)/sizeof(sGuid[0])); + StringFromGUID2(rfid, sGuid, ARRAY_SIZE(sGuid)); hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, sGuid, 0, REG_SZ, (LPBYTE)pszTargetPath, (lstrlenW(pszTargetPath)+1)*sizeof(WCHAR))); @@ -5479,7 +5480,7 @@ static HRESULT get_known_folder_path_by_id( /* if this is registry-registered known folder, get path from registry */ if(lpRegistryPath) { - StringFromGUID2(folderId, sGuid, sizeof(sGuid)/sizeof(sGuid[0])); + StringFromGUID2(folderId, sGuid, ARRAY_SIZE(sGuid)); hr = get_known_folder_path(sGuid, lpRegistryPath, ppszPath); } @@ -5709,7 +5710,7 @@ static HRESULT WINAPI foldermanager_FolderIdFromCsidl( { TRACE("%d, %p\n", nCsidl, pfid); - if (nCsidl >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + if (nCsidl >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; *pfid = *CSIDL_Data[nCsidl].id; return S_OK; @@ -5879,7 +5880,7 @@ static HRESULT register_folder(const KNOWNFOLDERID *rfid, const KNOWNFOLDER_DEFI if(SUCCEEDED(hr) && !IsEqualGUID(&pKFD->fidParent, &GUID_NULL)) { WCHAR sParentGuid[39]; - StringFromGUID2(&pKFD->fidParent, sParentGuid, sizeof(sParentGuid)/sizeof(sParentGuid[0])); + StringFromGUID2(&pKFD->fidParent, sParentGuid, ARRAY_SIZE(sParentGuid)); /* this known folder has parent folder */ hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szParentFolder, 0, REG_SZ, (LPBYTE)sParentGuid, sizeof(sParentGuid))); @@ -5985,7 +5986,7 @@ static HRESULT foldermanager_create( void **ppv ) fm->refs = 1; fm->num_ids = 0; - for (i = 0; i < sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]); i++) + for (i = 0; i < ARRAY_SIZE(CSIDL_Data); i++) { if (!IsEqualGUID( CSIDL_Data[i].id, &GUID_NULL )) fm->num_ids++; } @@ -5995,7 +5996,7 @@ static HRESULT foldermanager_create( void **ppv ) heap_free( fm ); return E_OUTOFMEMORY; } - for (i = j = 0; i < sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]); i++) + for (i = j = 0; i < ARRAY_SIZE(CSIDL_Data); i++) { if (!IsEqualGUID( CSIDL_Data[i].id, &GUID_NULL )) { @@ -6091,7 +6092,9 @@ HRESULT WINAPI SHGetKnownFolderItem(REFKNOWNFOLDERID rfid, KNOWN_FOLDER_FLAG fla static void register_system_knownfolders(void) { int i; - for(i = 0; i < sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]); ++i){ + + for (i = 0; i < ARRAY_SIZE(CSIDL_Data); ++i) + { const CSIDL_DATA *folder = &CSIDL_Data[i]; if(folder->pszName){ KNOWNFOLDER_DEFINITION kfd; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 880291c8ef..d0b97c69e6 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -94,8 +94,6 @@ static const shvheader desktop_header[] = { &FMTID_Storage, PID_STG_ATTRIBUTES, IDS_SHV_COLUMN5, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 5 }, }; -#define DESKTOPSHELLVIEWCOLUMNS sizeof(desktop_header)/sizeof(shvheader) - /************************************************************************** * ISF_Desktop_fnQueryInterface * @@ -289,14 +287,14 @@ static void add_shell_namespace_extensions(IEnumIDListImpl *list, HKEY root) static const WCHAR clsidfmtW[] = {'C','L','S','I','D','\\','%','s','\\', 'S','h','e','l','l','F','o','l','d','e','r',0}; static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; - WCHAR guid[39], clsidkeyW[sizeof(clsidfmtW)/sizeof(*clsidfmtW) + 39]; + WCHAR guid[39], clsidkeyW[ARRAY_SIZE(clsidfmtW) + 39]; DWORD size, i = 0; HKEY hkey; if (RegOpenKeyExW(root, Desktop_NameSpaceW, 0, KEY_READ, &hkey)) return; - size = sizeof(guid)/sizeof(guid[0]); + size = ARRAY_SIZE(guid); while (!RegEnumKeyExW(hkey, i++, guid, &size, 0, NULL, NULL, NULL)) { DWORD attributes, value_size = sizeof(attributes); @@ -308,7 +306,7 @@ static void add_shell_namespace_extensions(IEnumIDListImpl *list, HKEY root) if (!(attributes & SFGAO_NONENUMERATED)) AddToEnumList(list, _ILCreateGuidFromStrW(guid)); - size = sizeof(guid)/sizeof(guid[0]); + size = ARRAY_SIZE(guid); } RegCloseKey(hkey); @@ -784,8 +782,8 @@ static HRESULT WINAPI ISF_Desktop_fnGetDefaultColumnState ( TRACE ("(%p)->(%d %p)\n", This, iColumn, pcsFlags); - if (!pcsFlags || iColumn >= DESKTOPSHELLVIEWCOLUMNS) - return E_INVALIDARG; + if (!pcsFlags || iColumn >= ARRAY_SIZE(desktop_header)) + return E_INVALIDARG; *pcsFlags = desktop_header[iColumn].pcsFlags; @@ -809,7 +807,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDetailsOf (IShellFolder2 * iface, TRACE ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); - if (!psd || iColumn >= DESKTOPSHELLVIEWCOLUMNS) + if (!psd || iColumn >= ARRAY_SIZE(desktop_header)) return E_INVALIDARG; if (!pidl) @@ -846,7 +844,7 @@ static HRESULT WINAPI ISF_Desktop_fnMapColumnToSCID(IShellFolder2 *iface, UINT c TRACE("(%p)->(%u %p)\n", This, column, scid); - if (column >= DESKTOPSHELLVIEWCOLUMNS) + if (column >= ARRAY_SIZE(desktop_header)) return E_INVALIDARG; return shellfolder_map_column_to_scid(desktop_header, column, scid); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 1e7d1f2629..66150f4ce8 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1089,8 +1089,8 @@ ISFHelper_fnGetUniqueName (ISFHelper * iface, LPWSTR pwszName, UINT uLen) TRACE ("(%p)(%p %u)\n", This, pwszName, uLen); - LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, sizeof(wszNewFolder)/sizeof(WCHAR)); - if (uLen < sizeof(wszNewFolder)/sizeof(WCHAR) + 3) + LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, ARRAY_SIZE(wszNewFolder)); + if (uLen < ARRAY_SIZE(wszNewFolder) + 3) return E_POINTER; lstrcpynW (pwszName, wszNewFolder, uLen); @@ -1180,10 +1180,8 @@ ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, WCHAR wszCaption[256]; /* Cannot Create folder because of permissions */ - LoadStringW (shell32_hInstance, IDS_CREATEFOLDER_DENIED, wszTempText, - sizeof (wszTempText)/sizeof (wszTempText[0])); - LoadStringW (shell32_hInstance, IDS_CREATEFOLDER_CAPTION, wszCaption, - sizeof (wszCaption)/sizeof (wszCaption[0])); + LoadStringW (shell32_hInstance, IDS_CREATEFOLDER_DENIED, wszTempText, ARRAY_SIZE(wszTempText)); + LoadStringW (shell32_hInstance, IDS_CREATEFOLDER_CAPTION, wszCaption, ARRAY_SIZE(wszCaption)); sprintfW (wszText, wszTempText, wszNewDir); MessageBoxW (hwnd, wszText, wszCaption, MB_OK | MB_ICONEXCLAMATION); } diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 471abd879e..71b21c5e73 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -79,8 +79,6 @@ static const shvheader networkplaces_header[] = { NULL, 0, IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10 }, }; -#define NETWORKPLACESSHELLVIEWCOLUMNS sizeof(networkplaces_header)/sizeof(shvheader) - /************************************************************************** * ISF_NetworkPlaces_Constructor */ @@ -199,8 +197,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnParseDisplayName (IShellFolder2 * ifac szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); len = strlenW(szElement); - if (len == sizeof(wszEntireNetwork)/sizeof(wszEntireNetwork[0]) && - !strncmpiW(szElement, wszEntireNetwork, sizeof(wszEntireNetwork)/sizeof(wszEntireNetwork[0]))) + if (len == ARRAY_SIZE(wszEntireNetwork) && !strncmpiW(szElement, wszEntireNetwork, ARRAY_SIZE(wszEntireNetwork))) { pidlTemp = _ILCreateEntireNetwork(); if (pidlTemp) @@ -534,7 +531,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetDefaultColumnState ( TRACE ("(%p)->(%d %p)\n", This, iColumn, pcsFlags); - if (!pcsFlags || iColumn >= NETWORKPLACESSHELLVIEWCOLUMNS) + if (!pcsFlags || iColumn >= ARRAY_SIZE(networkplaces_header)) return E_INVALIDARG; *pcsFlags = networkplaces_header[iColumn].pcsFlags; @@ -567,7 +564,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnMapColumnToSCID (IShellFolder2 *iface, TRACE("(%p)->(%u %p)\n", This, column, scid); - if (column >= NETWORKPLACESSHELLVIEWCOLUMNS) + if (column >= ARRAY_SIZE(networkplaces_header)) return E_INVALIDARG; return shellfolder_map_column_to_scid(networkplaces_header, column, scid); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index cde815a99d..732a103b50 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1362,7 +1362,7 @@ static HRESULT WINAPI ShellFolder2_SetNameOf(IShellFolder2* iface, HWND hwnd, return E_INVALIDARG; /* check for invalid characters in lpcwszName. */ - for (i=0; i < sizeof(awcInvalidChars)/sizeof(*awcInvalidChars); i++) + for (i=0; i < ARRAY_SIZE(awcInvalidChars); i++) if (StrChrW(lpcwszName, awcInvalidChars[i])) return HRESULT_FROM_WIN32(ERROR_CANCELLED); @@ -1862,9 +1862,9 @@ static HRESULT WINAPI SFHelper_GetUniqueName(ISFHelper* iface, LPWSTR pwszName, TRACE("(%p)->(%p %u)\n", This, pwszName, uLen); - LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, sizeof(wszNewFolder)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, ARRAY_SIZE(wszNewFolder)); - if (uLen < sizeof(wszNewFolder)/sizeof(WCHAR)+3) + if (uLen < ARRAY_SIZE(wszNewFolder) + 3) return E_INVALIDARG; hr = IShellFolder2_EnumObjects(&This->IShellFolder2_iface, 0, @@ -1913,9 +1913,9 @@ static HRESULT WINAPI SFHelper_AddFolder(ISFHelper* iface, HWND hwnd, LPCWSTR pw char szMessage[256 + FILENAME_MAX]; char szCaption[256]; - LoadStringA(shell32_hInstance, IDS_CREATEFOLDER_DENIED, szCaption, sizeof(szCaption)); + LoadStringA(shell32_hInstance, IDS_CREATEFOLDER_DENIED, szCaption, ARRAY_SIZE(szCaption)); sprintf(szMessage, szCaption, szNewDir); - LoadStringA(shell32_hInstance, IDS_CREATEFOLDER_CAPTION, szCaption, sizeof(szCaption)); + LoadStringA(shell32_hInstance, IDS_CREATEFOLDER_CAPTION, szCaption, ARRAY_SIZE(szCaption)); MessageBoxA(hwnd, szMessage, szCaption, MB_OK | MB_ICONEXCLAMATION); return E_FAIL; diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 2055d21d30..d77e213c6d 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -158,7 +158,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp if (!done || (*fmt == '1')) { /*FIXME Is the call to SearchPathW() really needed? We already have separated out the parameter string in args. */ - if (SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL)) + if (SearchPathW(NULL, lpFile, wszExe, ARRAY_SIZE(xlpFile), xlpFile, NULL)) cmd = xlpFile; else cmd = lpFile; @@ -202,7 +202,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp HGLOBAL hmem = SHAllocShared(pidl, ILGetSize(pidl), 0); pv = SHLockShared(hmem, 0); chars = sprintfW(buf, wszILPtr, pv); - if (chars >= sizeof(buf)/sizeof(WCHAR)) + if (chars >= ARRAY_SIZE(buf)) ERR("pidl format buffer too small!\n"); used += chars; if (used < len) @@ -502,7 +502,7 @@ static UINT SHELL_FindExecutableByVerb(LPCWSTR lpVerb, LPWSTR key, LPWSTR classn if (RegOpenKeyExW(HKEY_CLASSES_ROOT, classname, 0, 0x02000000, &hkeyClass)) return SE_ERR_NOASSOC; - if (!HCR_GetDefaultVerbW(hkeyClass, lpVerb, verb, sizeof(verb)/sizeof(verb[0]))) + if (!HCR_GetDefaultVerbW(hkeyClass, lpVerb, verb, ARRAY_SIZE(verb))) return SE_ERR_NOASSOC; RegCloseKey(hkeyClass); @@ -603,13 +603,13 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, return 33; } - if (SearchPathW(lpPath, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL)) + if (SearchPathW(lpPath, lpFile, wszExe, ARRAY_SIZE(xlpFile), xlpFile, NULL)) { TRACE("SearchPathW returned non-zero\n"); lpFile = xlpFile; /* The file was found in the application-supplied default directory (or the system search path) */ } - else if (lpPath && SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL)) + else if (lpPath && SearchPathW(NULL, lpFile, wszExe, ARRAY_SIZE(xlpFile), xlpFile, NULL)) { TRACE("SearchPathW returned non-zero\n"); lpFile = xlpFile; @@ -652,7 +652,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, /* See if it's a program - if GetProfileString fails, we skip this * section. Actually, if GetProfileString fails, we've probably * got a lot more to worry about than running a program... */ - if (GetProfileStringW(wWindows, wPrograms, wExtensions, wBuffer, sizeof(wBuffer)/sizeof(WCHAR)) > 0) + if (GetProfileStringW(wWindows, wPrograms, wExtensions, wBuffer, ARRAY_SIZE(wBuffer)) > 0) { CharLowerW(wBuffer); tok = wBuffer; @@ -684,7 +684,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, &classnamelen) == ERROR_SUCCESS) { classnamelen /= sizeof(WCHAR); - if (classnamelen == sizeof(classname)/sizeof(WCHAR)) + if (classnamelen == ARRAY_SIZE(classname)) classnamelen--; classname[classnamelen] = '\0'; TRACE("File type: %s\n", debugstr_w(classname)); @@ -734,7 +734,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, /* Toss the leading dot */ extension++; - if (GetProfileStringW(wExtensions, extension, wszEmpty, command, sizeof(command)/sizeof(WCHAR)) > 0) + if (GetProfileStringW(wExtensions, extension, wszEmpty, command, ARRAY_SIZE(command)) > 0) { if (strlenW(command) != 0) { diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 315f5a7453..02e7a1ba38 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -288,12 +288,13 @@ static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FI if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; - LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR)); - LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR)); + 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); - 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)); ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 1c262e74b0..4047c714d3 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -905,7 +905,7 @@ UINT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAd miiSrc.fType = MFT_STRING; miiSrc.dwTypeData = szName; miiSrc.dwItemData = 0; - miiSrc.cch = sizeof(szName)/sizeof(WCHAR); + miiSrc.cch = ARRAY_SIZE(szName); if (!GetMenuItemInfoW(hmSrc, nItem, TRUE, &miiSrc)) { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index ecc23cb727..c0c027fbd3 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -426,7 +426,7 @@ static void ShellView_InitList(IShellViewImpl *This) lvColumn.fmt = sd.fmt; lvColumn.cx = MulDiv(sd.cxChar, tm.tmAveCharWidth * 3, 2); /* chars->pixel */ - StrRetToStrNW(nameW, sizeof(nameW)/sizeof(WCHAR), &sd.str, NULL); + StrRetToStrNW(nameW, ARRAY_SIZE(nameW), &sd.str, NULL); SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, This->columns, (LPARAM)&lvColumn); } diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 7c5704505a..3a17cf3daa 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -30,6 +30,7 @@ #include "winnls.h" #include "winuser.h" #include "shellapi.h" +#include "shell32_main.h" #include "wine/debug.h" #include "wine/heap.h" @@ -94,7 +95,7 @@ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) /* szTip */ if (pnid->uFlags & NIF_TIP) - MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1, nidW.szTip, sizeof(nidW.szTip)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1, nidW.szTip, ARRAY_SIZE(nidW.szTip)); if (cbSize >= NOTIFYICONDATAA_V2_SIZE) { @@ -104,8 +105,8 @@ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) /* szInfo, szInfoTitle */ if (pnid->uFlags & NIF_INFO) { - MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1, nidW.szInfo, sizeof(nidW.szInfo)/sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, sizeof(nidW.szInfoTitle)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1, nidW.szInfo, ARRAY_SIZE(nidW.szInfo)); + MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, ARRAY_SIZE(nidW.szInfoTitle)); } nidW.u.uTimeout = pnid->u.uTimeout; @@ -228,8 +229,8 @@ noicon: } if (data->uFlags & NIF_INFO) { - lstrcpynW( data->szInfo, nid->szInfo, sizeof(data->szInfo)/sizeof(WCHAR) ); - lstrcpynW( data->szInfoTitle, nid->szInfoTitle, sizeof(data->szInfoTitle)/sizeof(WCHAR) ); + lstrcpynW( data->szInfo, nid->szInfo, ARRAY_SIZE(data->szInfo) ); + lstrcpynW( data->szInfoTitle, nid->szInfoTitle, ARRAY_SIZE(data->szInfoTitle)); data->u.uTimeout = nid->u.uTimeout; data->dwInfoFlags = nid->dwInfoFlags; } diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 3f1d317b72..622ef34623 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -99,10 +99,8 @@ static const std_path paths[] = { {"XDG_CACHE_HOME", "$HOME/.cache"} }; -#define PATHS_COUNT (sizeof(paths)/sizeof(paths[0])) - /* will be filled with paths as they are computed */ -static const char *path_values[PATHS_COUNT] = { +static const char *path_values[ARRAY_SIZE(paths)] = { NULL, NULL, NULL, @@ -161,7 +159,7 @@ static char *load_path(int path_id) */ static const char *XDG_GetPath(int path_id) { - if (path_id >= PATHS_COUNT || path_id < 0) + if (path_id >= ARRAY_SIZE(paths) || path_id < 0) { ERR("Invalid path_id %d\n", path_id); return NULL; -- 2.16.2

1 0

[PATCH] strmdll: Add new stub dll
by Stefan Leichter 18 Mar '18

18 Mar '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=43232 Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- configure.ac | 1 + dlls/strmdll/Makefile.in | 4 ++++ dlls/strmdll/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/strmdll/strmdll.spec | 5 +++++ 4 files changed, 51 insertions(+) create mode 100644 dlls/strmdll/Makefile.in create mode 100644 dlls/strmdll/main.c create mode 100644 dlls/strmdll/strmdll.spec

1 0

[PATCH 4/5] wined3d: Pass the destination x/y coordinates as separate parameters to wined3d_surface_upload_data().
by Henri Verbeet 18 Mar '18

18 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 51 +++++++++++++++++++----------------------- dlls/wined3d/texture.c | 10 ++++----- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 794e2a35869..34f3ff3751e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -777,8 +777,8 @@ static void texture2d_download_data(struct wined3d_texture *texture, unsigned in /* 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, const POINT *dst_point, BOOL srgb, - const struct wined3d_const_bo_address *data) + 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; @@ -786,9 +786,9 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s GLenum target; TRACE("texure %p, sub_resource_idx %u, gl_info %p, format %s, src_box %s, " - "src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", + "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, wine_dbgstr_point(dst_point), srgb, data->buffer_object, data->addr); + src_pitch, dst_x, dst_y, srgb, data->buffer_object, data->addr); if (texture->sub_resources[sub_resource_idx].map_count) { @@ -831,21 +831,20 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s 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_point->x, dst_point->y, - update_w, update_h, internal, dst_slice_pitch, addr); + 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_point->x, dst_point->y, + 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_point->x, dst_point->y, + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, dst_y, update_w, update_h, internal, dst_slice_pitch, addr)); } } @@ -856,16 +855,16 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s /* glCompressedTexSubImage2D() ignores pixel store state, so we * can't use the unpack row length like for glTexSubImage2D. */ - for (row = 0, y = dst_point->y; row < row_count; ++row) + for (row = 0, y = dst_y; row < row_count; ++row) { if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_point->x, y, + 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_point->x, y, + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, update_w, format->block_height, internal, dst_row_pitch, addr)); } @@ -884,18 +883,18 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s 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_point->x, dst_point->y, + 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_point->x, dst_point->y, + 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_point->x, dst_point->y, + 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); @@ -923,8 +922,8 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s } } -static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture, - unsigned int dst_sub_resource_idx, const POINT *dst_point, struct wined3d_texture *src_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; @@ -934,9 +933,9 @@ static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture struct wined3d_bo_address data; UINT update_w, update_h; - TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_point %s, " + TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_x %u, dst_y %u, " "src_texture %p, src_sub_resource_idx %u, src_box %s.\n", - dst_texture, dst_sub_resource_idx, wine_dbgstr_point(dst_point), + dst_texture, dst_sub_resource_idx, dst_x, dst_y, src_texture, src_sub_resource_idx, debug_box(src_box)); context = context_acquire(dst_texture->resource.device, NULL, 0); @@ -961,7 +960,7 @@ static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture 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_point, FALSE, wined3d_const_bo_address(&data)); + src_box, src_row_pitch, dst_x, dst_y, FALSE, wined3d_const_bo_address(&data)); context_release(context); @@ -1316,14 +1315,13 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr else { struct wined3d_box src_box = {0, 0, desc.width, desc.height, 0, 1}; - POINT dst_point = {0, 0}; TRACE("Using upload conversion.\n"); 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, &dst_point, FALSE, wined3d_const_bo_address(&src_data)); + &src_box, src_row_pitch, 0, 0, FALSE, wined3d_const_bo_address(&src_data)); wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, 0, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2149,7 +2147,6 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re BYTE *src_mem, *dst_mem = NULL; struct wined3d_format format; struct wined3d_box src_box; - POINT dst_point = {0, 0}; BOOL depth; depth = texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL; @@ -2305,7 +2302,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re } wined3d_surface_upload_data(texture, sub_resource_idx, gl_info, &format, &src_box, - src_row_pitch, &dst_point, srgb, wined3d_const_bo_address(&data)); + src_row_pitch, 0, 0, srgb, wined3d_const_bo_address(&data)); heap_free(dst_mem); @@ -3842,10 +3839,8 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("Not doing upload because the destination format needs conversion.\n"); else { - POINT dst_point = {dst_box->left, dst_box->top}; - if (SUCCEEDED(texture2d_upload_from_surface(dst_texture, dst_sub_resource_idx, - &dst_point, src_texture, src_sub_resource_idx, src_box))) + dst_box->left, dst_box->top, src_texture, src_sub_resource_idx, src_box))) { if (!wined3d_resource_is_offscreen(&dst_texture->resource)) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6dd013af37c..83c7a41632f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1758,7 +1758,7 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int { struct wined3d_box src_box; unsigned int texture_level; - POINT dst_point; + unsigned int dst_x, dst_y; src_box.left = 0; src_box.top = 0; @@ -1766,21 +1766,21 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int src_box.back = 1; if (box) { - dst_point.x = box->left; - dst_point.y = box->top; + dst_x = box->left; + dst_y = box->top; src_box.right = box->right - box->left; src_box.bottom = box->bottom - box->top; } else { - dst_point.x = dst_point.y = 0; + 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, - texture->resource.format, &src_box, row_pitch, &dst_point, FALSE, data); + texture->resource.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. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f44dee4f76..4c655c4bf30 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3335,7 +3335,7 @@ struct fbo_entry 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, const POINT *dst_point, + 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, -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_box structure to wined3d_surface_upload_data().
by Henri Verbeet 18 Mar '18

18 Mar '18

For consistency with wined3d_texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 52 +++++++++++++++++++++++------------------- dlls/wined3d/texture.c | 18 ++++++++------- dlls/wined3d/wined3d_private.h | 6 ++--- 3 files changed, 42 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7f74d4954de..794e2a35869 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -776,17 +776,18 @@ static void texture2d_download_data(struct wined3d_texture *texture, unsigned in * 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 RECT *src_rect, - unsigned int src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) + const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, + const struct wined3d_box *src_box, unsigned int src_pitch, const POINT *dst_point, BOOL srgb, + const struct wined3d_const_bo_address *data) { - UINT update_w = src_rect->right - src_rect->left; - UINT update_h = src_rect->bottom - src_rect->top; + 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_rect %s, " + TRACE("texure %p, sub_resource_idx %u, gl_info %p, format %s, src_box %s, " "src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", - texture, sub_resource_idx, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), + texture, sub_resource_idx, gl_info, debug_d3dformat(format->id), debug_box(src_box), src_pitch, wine_dbgstr_point(dst_point), srgb, data->buffer_object, data->addr); if (texture->sub_resources[sub_resource_idx].map_count) @@ -817,8 +818,8 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s const BYTE *addr = data->addr; GLenum internal; - addr += (src_rect->top / format->block_height) * src_pitch; - addr += (src_rect->left / format->block_width) * format->block_byte_count; + 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; @@ -878,8 +879,8 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s { const BYTE *addr = data->addr; - addr += src_rect->top * src_pitch; - addr += src_rect->left * format->byte_count; + 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", @@ -924,7 +925,7 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const POINT *dst_point, struct wined3d_texture *src_texture, - unsigned int src_sub_resource_idx, const RECT *src_rect) + 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; @@ -934,9 +935,9 @@ static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture UINT update_w, update_h; TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_point %s, " - "src_texture %p, src_sub_resource_idx %u, src_rect %s.\n", + "src_texture %p, src_sub_resource_idx %u, src_box %s.\n", dst_texture, dst_sub_resource_idx, wine_dbgstr_point(dst_point), - src_texture, src_sub_resource_idx, wine_dbgstr_rect(src_rect)); + src_texture, src_sub_resource_idx, debug_box(src_box)); context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info; @@ -944,8 +945,8 @@ static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture /* Only load the sub-resource for partial updates. For newly allocated * textures the texture wouldn't be the current location, and we'd upload * zeroes just to overwrite them again. */ - update_w = src_rect->right - src_rect->left; - update_h = src_rect->bottom - src_rect->top; + update_w = src_box->right - src_box->left; + update_h = src_box->bottom - src_box->top; dst_level = dst_sub_resource_idx % dst_texture->level_count; if (update_w == wined3d_texture_get_level_width(dst_texture, dst_level) && update_h == wined3d_texture_get_level_height(dst_texture, dst_level)) @@ -959,8 +960,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_rect, - src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); + wined3d_surface_upload_data(dst_texture, dst_sub_resource_idx, gl_info, src_texture->resource.format, + src_box, src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); context_release(context); @@ -1314,7 +1315,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr } else { - RECT src_rect = {0, 0, desc.width, desc.height}; + struct wined3d_box src_box = {0, 0, desc.width, desc.height, 0, 1}; POINT dst_point = {0, 0}; TRACE("Using upload conversion.\n"); @@ -1322,7 +1323,7 @@ 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_rect, src_row_pitch, &dst_point, FALSE, wined3d_const_bo_address(&src_data)); + &src_box, src_row_pitch, &dst_point, FALSE, wined3d_const_bo_address(&src_data)); wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, 0, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2147,8 +2148,8 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re struct wined3d_bo_address data; BYTE *src_mem, *dst_mem = NULL; struct wined3d_format format; + struct wined3d_box src_box; POINT dst_point = {0, 0}; - RECT src_rect; BOOL depth; depth = texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL; @@ -2166,7 +2167,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re level = sub_resource_idx % texture->level_count; width = wined3d_texture_get_level_width(texture, level); height = wined3d_texture_get_level_height(texture, level); - SetRect(&src_rect, 0, 0, width, height); + wined3d_box_set(&src_box, 0, 0, width, height, 0, 1); if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) @@ -2174,6 +2175,9 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re &texture->resource, WINED3D_LOCATION_TEXTURE_RGB, &texture->resource, WINED3D_LOCATION_TEXTURE_SRGB)) { + RECT src_rect; + + SetRect(&src_rect, 0, 0, width, height); if (srgb) texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &src_rect, @@ -2192,7 +2196,9 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re DWORD src_location = sub_resource->locations & WINED3D_LOCATION_RB_RESOLVED ? WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; + RECT src_rect; + SetRect(&src_rect, 0, 0, width, height); if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, &texture->resource, src_location, &texture->resource, dst_location)) texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, texture, sub_resource_idx, @@ -2298,7 +2304,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re data.addr = dst_mem; } - wined3d_surface_upload_data(texture, sub_resource_idx, gl_info, &format, &src_rect, + wined3d_surface_upload_data(texture, sub_resource_idx, gl_info, &format, &src_box, src_row_pitch, &dst_point, srgb, wined3d_const_bo_address(&data)); heap_free(dst_mem); @@ -3839,7 +3845,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ POINT dst_point = {dst_box->left, dst_box->top}; if (SUCCEEDED(texture2d_upload_from_surface(dst_texture, dst_sub_resource_idx, - &dst_point, src_texture, src_sub_resource_idx, &src_rect))) + &dst_point, src_texture, src_sub_resource_idx, src_box))) { if (!wined3d_resource_is_offscreen(&dst_texture->resource)) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 124aa316e6c..6dd013af37c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1756,29 +1756,31 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int const struct wined3d_context *context, 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; unsigned int texture_level; POINT dst_point; - RECT src_rect; - src_rect.left = 0; - src_rect.top = 0; + src_box.left = 0; + src_box.top = 0; + src_box.front = 0; + src_box.back = 1; if (box) { dst_point.x = box->left; dst_point.y = box->top; - src_rect.right = box->right - box->left; - src_rect.bottom = box->bottom - box->top; + src_box.right = box->right - box->left; + src_box.bottom = box->bottom - box->top; } else { dst_point.x = dst_point.y = 0; texture_level = sub_resource_idx % texture->level_count; - src_rect.right = wined3d_texture_get_level_width(texture, texture_level); - src_rect.bottom = wined3d_texture_get_level_height(texture, texture_level); + 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, - texture->resource.format, &src_rect, row_pitch, &dst_point, FALSE, data); + texture->resource.format, &src_box, row_pitch, &dst_point, FALSE, data); } /* 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 302b6ea4c80..6f44dee4f76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3334,9 +3334,9 @@ struct fbo_entry }; 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 RECT *src_rect, - unsigned int src_pitch, const POINT *dst_point, BOOL srgb, - const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; + const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, + const struct wined3d_box *src_box, unsigned int src_pitch, const POINT *dst_point, + 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, -- 2.11.0

1 0

[PATCH 2/5] wined3d: Merge texture2d_prepare_texture() and texture3d_prepare_texture().
by Henri Verbeet 18 Mar '18

18 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 126 +++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 46 insertions(+), 82 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ba0fa63e80d..124aa316e6c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -441,7 +441,7 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * const struct wined3d_gl_info *gl_info) { unsigned int level, level_count, layer, layer_count; - GLsizei width, height; + GLsizei width, height, depth; GLenum target; level_count = texture->level_count; @@ -464,10 +464,12 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * TRACE("texture %p, layer %u, level %u, target %#x, width %u, height %u.\n", texture, layer, level, target, width, height); - if (texture->target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_3D || target == GL_TEXTURE_2D_ARRAY) { + depth = wined3d_texture_get_level_depth(texture, level); GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, - texture->layer_count, 0, format->glFormat, format->glType, NULL)); + target == GL_TEXTURE_2D_ARRAY ? texture->layer_count : depth, 0, + format->glFormat, format->glType, NULL)); checkGLcall("glTexImage3D"); } else @@ -491,6 +493,10 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture switch (texture->target) { + case GL_TEXTURE_3D: + GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, + gl_internal_format, width, height, wined3d_texture_get_level_depth(texture, 0))); + break; case GL_TEXTURE_2D_ARRAY: GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, gl_internal_format, width, height, texture->layer_count)); @@ -1556,10 +1562,17 @@ static void wined3d_texture_force_reload(struct wined3d_texture *texture) } } +/* Context activation is done by the caller. */ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; + const struct wined3d_format *format = texture->resource.format; const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_color_key_conversion *conversion; + GLenum internal; + + TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); if (!d3d_info->shader_color_key && !(texture->async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY) @@ -1574,7 +1587,36 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win if (texture->flags & alloc_flag) return; - texture->texture_ops->texture_prepare_texture(texture, context, srgb); + if (format->conv_byte_count) + { + texture->flags |= WINED3D_TEXTURE_CONVERTED; + } + else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) + { + texture->flags |= WINED3D_TEXTURE_CONVERTED; + format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); + TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); + } + + wined3d_texture_bind_and_dirtify(texture, context, srgb); + + 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; + + if (!internal) + FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); + + TRACE("internal %#x, format %#x, type %#x.\n", internal, format->glFormat, format->glType); + + if (wined3d_texture_use_immutable_storage(texture, gl_info)) + wined3d_texture_allocate_gl_immutable_storage(texture, internal, gl_info); + else + wined3d_texture_allocate_gl_mutable_storage(texture, internal, format, gl_info); texture->flags |= alloc_flag; } @@ -1771,53 +1813,10 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in } } -/* Context activation is done by the caller. */ -static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) -{ - const struct wined3d_format *format = texture->resource.format; - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_color_key_conversion *conversion; - GLenum internal; - - TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); - - if (format->conv_byte_count) - { - texture->flags |= WINED3D_TEXTURE_CONVERTED; - } - else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) - { - texture->flags |= WINED3D_TEXTURE_CONVERTED; - format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); - TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); - } - - wined3d_texture_bind_and_dirtify(texture, context, srgb); - - 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; - - if (!internal) - FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); - - TRACE("internal %#x, format %#x, type %#x.\n", internal, format->glFormat, format->glType); - - if (wined3d_texture_use_immutable_storage(texture, gl_info)) - wined3d_texture_allocate_gl_immutable_storage(texture, internal, gl_info); - else - wined3d_texture_allocate_gl_mutable_storage(texture, internal, format, gl_info); -} - static const struct wined3d_texture_ops texture2d_ops = { texture2d_upload_data, texture2d_load_location, - texture2d_prepare_texture, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2646,43 +2645,10 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in return TRUE; } -static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) -{ - const struct wined3d_format *format = texture->resource.format; - GLenum internal = srgb ? format->glGammaInternal : format->glInternal; - unsigned int sub_count = texture->level_count * texture->layer_count; - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i; - - wined3d_texture_bind_and_dirtify(texture, context, srgb); - - if (wined3d_texture_use_immutable_storage(texture, gl_info)) - { - GL_EXTCALL(glTexStorage3D(GL_TEXTURE_3D, texture->level_count, internal, - wined3d_texture_get_level_width(texture, 0), - wined3d_texture_get_level_height(texture, 0), - wined3d_texture_get_level_depth(texture, 0))); - checkGLcall("glTexStorage3D"); - } - else - { - for (i = 0; i < sub_count; ++i) - { - GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, i, internal, - wined3d_texture_get_level_width(texture, i), - wined3d_texture_get_level_height(texture, i), - wined3d_texture_get_level_depth(texture, i), - 0, format->glFormat, format->glType, NULL)); - checkGLcall("glTexImage3D"); - } - } -} - static const struct wined3d_texture_ops texture3d_ops = { texture3d_upload_data, texture3d_load_location, - texture3d_prepare_texture, }; HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 718ee63a214..302b6ea4c80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3088,8 +3088,6 @@ struct wined3d_texture_ops 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); - void (*texture_prepare_texture)(struct wined3d_texture *texture, - struct wined3d_context *context, BOOL srgb); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001 -- 2.11.0

1 0

[PATCH 1/5] wined3d: Resource size should always be non-zero in resource_init().
by Henri Verbeet 18 Mar '18

18 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 97f7aec4e12..8968c164ed5 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -91,6 +91,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3DERR_INVALIDCALL; } + if (!size) + ERR("Attempting to create a zero-sized resource.\n"); + for (i = 0; i < ARRAY_SIZE(resource_types); ++i) { if (resource_types[i].type != type @@ -188,17 +191,10 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->resource_ops = resource_ops; resource->map_binding = WINED3D_LOCATION_SYSMEM; - if (size) - { - if (!wined3d_resource_allocate_sysmem(resource)) - { - ERR("Failed to allocate system memory.\n"); - return E_OUTOFMEMORY; - } - } - else + if (!wined3d_resource_allocate_sysmem(resource)) { - resource->heap_memory = NULL; + ERR("Failed to allocate system memory.\n"); + return E_OUTOFMEMORY; } if (!(usage & WINED3DUSAGE_PRIVATE)) -- 2.11.0

1 0

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

18 Mar '18

From: Uberdaff <dagfinn(a)reiakvam.no> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 23 +++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 64 ++++++++++++++++++++++++++++++++++++++++++ include/netioapi.h | 1 + 4 files changed, 89 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..e7461ce 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,6 +3223,29 @@ 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 + { + 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 ); + } + + 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..681cfc4 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 == 0x00000080, + "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 == 0x000000ff, + "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 == 0x0000ffff, + "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 == 0x00ffffff, + "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 == 0xfeffffff, + "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 == 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 4

Wine staging 3.4 release
by Alistair Leslie-Hughes 18 Mar '18

18 Mar '18

Packages have been published to the following repository. https://repos.wine-staging.com/alesliehughes/ Summary of the past few weeks * Rebased to current wine 3.4 (Over 1000 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Fixes * Anti-alias fonts now work correctly in MS Office. * Fixed a crash in Assassin's Creed Syndicate. * Fixed a Texture issue in Vietcong. New Patches * Stop multiple crashes in the BattlEye service. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Eve Online, Assassin's Creed Syndicate, Tomb Raider to name a few. * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.com Best Regards Alistair.

3 2

GSOC
by Abhishek Kumar 18 Mar '18

18 Mar '18

Who is mentor of Explorer.exe? Please come ahead and start discussing the ideas with me.So that we complete this task on time.

2 1

[PATCH] ntoskrnl.exe: Dont forward some msvcrt functions
by Alistair Leslie-Hughes 18 Mar '18

18 Mar '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=44496 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 49 +++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 12 ++++----- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5701f856b1..63886583ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3303,3 +3303,52 @@ PKEVENT WINAPI IoCreateNotificationEvent(UNICODE_STRING *name, HANDLE *handle) FIXME( "stub: %s %p\n", debugstr_us(name), handle ); return NULL; } + + +/********************************************************************* + * memcpy (NTOSKRNL.@) + * + * NOTES + * Behaves like memmove. + */ +void * __cdecl NTOSKRNL_memcpy( void *dst, const void *src, size_t n ) +{ + return memmove( dst, src, n ); +} + +/********************************************************************* + * memset (NTOSKRNL.@) + */ +void * __cdecl NTOSKRNL_memset( void *dst, int c, size_t n ) +{ + return memset( dst, c, n ); +} + +int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) +{ + return strcasecmp( str1, str2 ); +} + +/********************************************************************* + * _strnicmp (NTOSKRNL.@) + */ +int __cdecl _strnicmp( LPCSTR str1, LPCSTR str2, size_t n ) +{ + return strncasecmp( str1, str2, n ); +} + +/********************************************************************* + * _wcsnicmp (NTOSKRNL.@) + */ +INT __cdecl NTOSKRNL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n ) +{ + return strncmpiW( str1, str2, n ); +} + +/********************************************************************* + * wcsncmp (NTOSKRNL.@) + */ +INT __cdecl NTOSKRNL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n ) +{ + return strncmpW( str1, str2, n ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 31c3136b77..8c3057f06e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1424,9 +1424,9 @@ @ cdecl -private _purecall() msvcrt._purecall @ varargs -private _snprintf(ptr long str) msvcrt._snprintf @ varargs -private _snwprintf(ptr long wstr) msvcrt._snwprintf -@ cdecl -private _stricmp(str str) msvcrt._stricmp +@ cdecl -private _stricmp(str str) @ cdecl -private _strlwr(str) msvcrt._strlwr -@ cdecl -private _strnicmp(str str long) msvcrt._strnicmp +@ cdecl -private _strnicmp(str str long) _strnicmp @ cdecl -private _strnset(str long long) msvcrt._strnset @ cdecl -private _strrev(str) msvcrt._strrev @ cdecl -private _strset(str long) msvcrt._strset @@ -1435,7 +1435,7 @@ @ cdecl -private _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl -private _wcsicmp(wstr wstr) msvcrt._wcsicmp @ cdecl -private _wcslwr(wstr) msvcrt._wcslwr -@ cdecl -private _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp +@ cdecl -private _wcsnicmp(wstr wstr long) NTOSKRNL__wcsnicmp @ cdecl -private _wcsnset(wstr long long) msvcrt._wcsnset @ cdecl -private _wcsrev(wstr) msvcrt._wcsrev @ cdecl -private _wcsupr(wstr) msvcrt._wcsupr @@ -1450,9 +1450,9 @@ @ cdecl -private mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl -private mbtowc(ptr str long) msvcrt.mbtowc @ cdecl -private memchr(ptr long long) msvcrt.memchr -@ cdecl -private memcpy(ptr ptr long) msvcrt.memcpy +@ cdecl -private memcpy(ptr ptr long) NTOSKRNL_memcpy @ cdecl -private memmove(ptr ptr long) msvcrt.memmove -@ cdecl -private memset(ptr long long) msvcrt.memset +@ cdecl -private memset(ptr long long) NTOSKRNL_memset @ cdecl -private qsort(ptr long long ptr) msvcrt.qsort @ cdecl -private rand() msvcrt.rand @ varargs -private sprintf(ptr str) msvcrt.sprintf @@ -1483,7 +1483,7 @@ @ cdecl -private wcscspn(wstr wstr) msvcrt.wcscspn @ cdecl -private wcslen(wstr) msvcrt.wcslen @ cdecl -private wcsncat(wstr wstr long) msvcrt.wcsncat -@ cdecl -private wcsncmp(wstr wstr long) msvcrt.wcsncmp +@ cdecl -private wcsncmp(wstr wstr long) NTOSKRNL_wcsncmp @ cdecl -private wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl -private wcsrchr(wstr long) msvcrt.wcsrchr @ cdecl -private wcsspn(wstr wstr) msvcrt.wcsspn -- 2.16.2

1 0

[PATCH] propsys: Add PSGetPropertyKeyFromName stub
by Alistair Leslie-Hughes 18 Mar '18

18 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index f518519276..db20fd39c9 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -83,7 +83,7 @@ @ stub PSGetPropertyDescriptionByName @ stdcall PSGetPropertyDescriptionListFromString(wstr ptr ptr) @ stub PSGetPropertyFromPropertyStorage -@ stub PSGetPropertyKeyFromName +@ stdcall PSGetPropertyKeyFromName(wstr ptr) @ stdcall PSGetPropertySystem(ptr ptr) @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 7631023b83..1dbaee433f 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -268,6 +268,12 @@ HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR proplist, REFIID r return E_NOTIMPL; } +HRESULT WINAPI PSGetPropertyKeyFromName(PCWSTR name, PROPERTYKEY *key) +{ + FIXME("%s, %p\n", debugstr_w(name), key); + return E_NOTIMPL; +} + HRESULT WINAPI PSRefreshPropertySchema(void) { FIXME("\n"); -- 2.16.2

1 0

[PATCH] ntprint/tests: Abort on missing function/dll
by Mark Jansen 17 Mar '18

17 Mar '18

2 1

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

17 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 1

[PATCH] pidgen: Add PIDGenSimpA stub
by Alistair Leslie-Hughes 17 Mar '18

17 Mar '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=31850 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index 3aa3e84444..7756df3ece 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -43,3 +43,10 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p6,int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_a(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index ad5c3694a9..8b7e778b91 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,6 +1,6 @@ @ stub PIDGenA @ stub PIDGenW -@ stub PIDGenSimpA +@ stdcall PIDGenSimpA(str long long long long long long long long) @ stub PIDGenSimpW @ stub SetupPIDGenA @ stub SetupPIDGenW -- 2.16.2

1 0

[PATCH 2/2] avifil32: Register proxy interfaces
by Alistair Leslie-Hughes 17 Mar '18

17 Mar '18

Based off a patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/avifil32/Makefile.in | 4 ++- dlls/avifil32/avifil32.idl | 78 ++++++++++++++++++++++++++++++++++++++++- dlls/avifil32/avifile_private.h | 1 + dlls/avifil32/factory.c | 8 ++++- 4 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index 81d2ff811e..4030514d95 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -1,6 +1,6 @@ MODULE = avifil32.dll IMPORTLIB = avifil32 -IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 +IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 C_SRCS = \ acmstream.c \ @@ -17,3 +17,5 @@ C_SRCS = \ IDL_SRCS = avifil32.idl RC_SRCS = avifil32.rc + +dlldata_EXTRADEFS = -DENTRY_PREFIX=avifil32_ diff --git a/dlls/avifil32/avifil32.idl b/dlls/avifil32/avifil32.idl index 420cbb9aba..1e3f191622 100644 --- a/dlls/avifil32/avifil32.idl +++ b/dlls/avifil32/avifil32.idl @@ -18,8 +18,84 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy #pragma makedep register +import "wtypes.idl"; +import "unknwn.idl"; + +typedef struct _AVISTREAMINFOW +{ + DWORD fccType; + DWORD fccHandler; + DWORD dwFlags; + DWORD dwCaps; + WORD wPriority; + WORD wLanguage; + DWORD dwScale; + DWORD dwRate; + DWORD dwStart; + DWORD dwLength; + DWORD dwInitialFrames; + DWORD dwSuggestedBufferSize; + DWORD dwQuality; + DWORD dwSampleSize; + RECT rcFrame; + DWORD dwEditCount; + DWORD dwFormatChangeCount; + WCHAR szName[64]; +} AVISTREAMINFOW; + +[ + object, + uuid(00020021-0000-0000-c000-000000000046) +] +interface IAVIStream : IUnknown +{ + HRESULT Create(LPARAM lParam1, LPARAM lParam2); + HRESULT Info(AVISTREAMINFOW *psi, LONG lSize); + LONG FindSample(LONG lPos, LONG lFlags); + HRESULT ReadFormat(LONG lPos, [out,size_is(*lpcbFormat)] char *lpFormat, [in,out] LONG *lpcbFormat); + HRESULT SetFormat(LONG lPos, [in,size_is(cbFormat)] char *lpFormat, LONG cbFormat); + HRESULT Read(LONG lStart, LONG lSamples, [out,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, LONG *plBytes, LONG *plSamples); + HRESULT Write(LONG lStart, LONG lSamples, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, DWORD dwFlags, LONG *plSampWritten, LONG *plBytesWritten); + HRESULT Delete(LONG lStart, LONG lSamples); + HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); + HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); + HRESULT SetInfo(AVISTREAMINFOW *plInfo, LONG cbInfo); +}; + +typedef struct _AVIFILEINFOW +{ + DWORD dwMaxBytesPerSec; + DWORD dwFlags; + DWORD dwCaps; + DWORD dwStreams; + DWORD dwSuggestedBufferSize; + DWORD dwWidth; + DWORD dwHeight; + DWORD dwScale; + DWORD dwRate; + DWORD dwLength; + DWORD dwEditCount; + WCHAR szFileType[64]; +} AVIFILEINFOW; + +[ + object, + uuid(00020020-0000-0000-c000-000000000046) +] +interface IAVIFile : IUnknown +{ + HRESULT Info(AVIFILEINFOW *pfi, LONG lSize); + HRESULT GetStream(IAVIStream **ppStream, DWORD fccType, LONG lParam); + HRESULT CreateStream(IAVIStream **ppStream, AVISTREAMINFOW *psi); + HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); + HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); + HRESULT EndRecord(void); + HRESULT DeleteStream(DWORD fccType, LONG lParam); +}; + [ helpstring("Microsoft AVI Files"), threading(both), @@ -46,7 +122,7 @@ coclass WAVFile { interface IAVIFile; } threading(both), uuid(0002000d-0000-0000-c000-000000000046) ] -coclass AVIProxy { } +coclass PSFactoryBuffer { interface IFactoryBuffer; } [ helpstring("ACM Compressed Audio Stream"), diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h index 16893d9c85..4bf11f42a8 100644 --- a/dlls/avifil32/avifile_private.h +++ b/dlls/avifil32/avifile_private.h @@ -66,5 +66,6 @@ extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN; extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN; +extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) DECLSPEC_HIDDEN; #endif diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 98231e828d..3775aa51a8 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -182,12 +182,18 @@ LPCWSTR AVIFILE_BasenameW(LPCWSTR szPath) */ HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) { + HRESULT hr; + TRACE("(%s,%s,%p)\n", debugstr_guid(pclsid), debugstr_guid(piid), ppv); if (pclsid == NULL || piid == NULL || ppv == NULL) return E_FAIL; - return AVIFILE_CreateClassFactory(pclsid,piid,ppv); + hr = AVIFILE_CreateClassFactory(pclsid,piid,ppv); + if (SUCCEEDED(hr)) + return hr; + + return avifil32_DllGetClassObject(pclsid,piid,ppv); } /***************************************************************************** -- 2.16.2

1 0

[PATCH 1/2] avifil32: Correct threading model on interfaces
by Alistair Leslie-Hughes 17 Mar '18

17 Mar '18

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Fixes: https://bugs.winehq.org/show_bug.cgi?id=38564 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/avifil32/avifil32.idl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/avifil32.idl b/dlls/avifil32/avifil32.idl index 1f50f154ae..420cbb9aba 100644 --- a/dlls/avifil32/avifil32.idl +++ b/dlls/avifil32/avifil32.idl @@ -22,35 +22,35 @@ [ helpstring("Microsoft AVI Files"), - threading(apartment), + threading(both), uuid(00020000-0000-0000-C000-000000000046) ] coclass AVIFile { interface IAVIFile; } [ helpstring("AVI Compressed Stream"), - threading(apartment), + threading(both), uuid(00020001-0000-0000-c000-000000000046) ] coclass ICMStream { interface IAVIStream; } [ helpstring("Microsoft Wave File"), - threading(apartment), + threading(both), uuid(00020003-0000-0000-c000-000000000046) ] coclass WAVFile { interface IAVIFile; } [ helpstring("IAVIStream & IAVIFile Proxy"), - threading(apartment), + threading(both), uuid(0002000d-0000-0000-c000-000000000046) ] coclass AVIProxy { } [ helpstring("ACM Compressed Audio Stream"), - threading(apartment), + threading(both), uuid(0002000f-0000-0000-c000-000000000046) ] coclass ACMStream { interface IAVIStream; } -- 2.16.2

1 0

[PATCH 2/2] vbscript: Added support for script context in ParseScriptText.
by Jacek Caban 16 Mar '18

16 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 15 +++---------- dlls/vbscript/interp.c | 10 +++++++++ dlls/vbscript/tests/run.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 12 +++++++++++ dlls/vbscript/vbscript.h | 1 + 5 files changed, 80 insertions(+), 12 deletions(-)

1 0

[PATCH 1/2] vbscript: Split named item lookup into a helper function.
by Jacek Caban 16 Mar '18

16 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 29 ++++++----------------------- dlls/vbscript/vbscript.c | 32 ++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 39 insertions(+), 23 deletions(-)

1 0

[PATCH] comctl32/tests: Prevent a possible nullptr dereference.
by Mark Jansen 16 Mar '18

16 Mar '18

1 0

[PATCH] dmstyle/tests: Relax style descriptor test with nothing loaded
by Alex Henrie 16 Mar '18

16 Mar '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This test has been failing on the Windows 7 testbot since February 26, likely because of a Windows update. dlls/dmstyle/tests/dmstyle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index ed12315a19..a773607f8b 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -458,9 +458,8 @@ static void test_parsedescriptor(void) /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || - broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ - "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + ok(desc.dwValidData & DMUS_OBJ_CLASS, + "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", wine_dbgstr_guid(&desc.guidClass)); -- 2.16.2

2 3

[PATCH] Added support for ConvertLengthToIpv4Mask in iphlpapi
by Uberdaff 16 Mar '18

16 Mar '18

From: Dagfinn Reiakvam <dagfinn(a)reiakvam.no> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++++ 2 files changed, 12 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..891f8f0 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,6 +3223,17 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) } /****************************************************************** + * ConvertLengthToIpv4Mask (IPHLPAPI.@) + */ +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG MaskLength, PULONG Mask) +{ + if(MaskLength <= 32) + return ERROR_INVALID_PARAMETER; + *Mask = 0xffffffff << ( 32 - MaskLength ); + return NO_ERROR; +} + +/****************************************************************** * if_nametoindex (IPHLPAPI.@) */ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) -- 2.7.4

4 4

[PATCH] windowscodecs: Implement WICCreateBitmapFromSection.
by Dmitry Timoshkov 16 Mar '18

16 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bitmap.c | 27 ++++++++----- dlls/windowscodecs/imgfactory.c | 73 ++++++++++++++++++++++++++++++++++- dlls/windowscodecs/windowscodecs.spec | 3 +- include/wincodec.idl | 8 ++++ 4 files changed, 100 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 6adaab0aea..76298b22ca 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -45,6 +45,7 @@ typedef struct BitmapImpl { int palette_set; LONG lock; /* 0 if not locked, -1 if locked for writing, count if locked for reading */ BYTE *data; + BOOL is_section; /* TRUE if data is a section created by an application */ UINT width, height; UINT stride; UINT bpp; @@ -284,7 +285,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->is_section) + UnmapViewOfFile(This->data); + else + HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); } @@ -694,13 +698,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, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { HRESULT hr; BitmapImpl *This; - BYTE *data; UINT bpp; hr = get_pixelformat_bpp(pixelFormat, &bpp); @@ -713,14 +716,20 @@ 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 (!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; + } + This->is_section = FALSE; } - if (bits) memcpy(data, bits, datasize); + else + This->is_section = TRUE; This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; This->IMILBitmapSource_iface.lpVtbl = &IMILBitmapImpl_Vtbl; diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index e1bcc89a8b..4ed01f5b26 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -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, 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) @@ -1176,3 +1200,50 @@ 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) +{ + DWORD access; + void *buffer; + HRESULT hr; + + TRACE("%u,%u,%s,%p,%u,%#x,%#x,%p\n", width, height, debugstr_guid(format), + section, stride, offset, wicaccess, bitmap); + + if (!width || !height || !section || !bitmap) return E_INVALIDARG; + + 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; + } + + buffer = MapViewOfFile(section, access, 0, offset, 0); + if (!buffer) return HRESULT_FROM_WIN32(GetLastError()); + + hr = BitmapImpl_Create(width, height, stride, 0, buffer, format, WICBitmapCacheOnLoad, bitmap); + if (FAILED(hr)) UnmapViewOfFile(buffer); + 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/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.16.2

4 8

[PATCH] winevulkan: Fix some typos in comments.
by Francois Gouget 16 Mar '18

16 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vk.xml | 2 +- dlls/winevulkan/vulkan.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5c5f38f40f1..1a2ae1700a9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -450,7 +450,7 @@ class VkFunction(object): else: proto += " {0}(".format(self.name) - # Add all the paremeters. + # Add all the parameters. proto += ", ".join([p.definition() for p in self.params]) if postfix is not None: diff --git a/dlls/winevulkan/vk.xml b/dlls/winevulkan/vk.xml index e013ce8b603..3f53dad504f 100644 --- a/dlls/winevulkan/vk.xml +++ b/dlls/winevulkan/vk.xml @@ -1308,7 +1308,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member><type>uint32_t</type> <name>maxGeometryOutputVertices</name></member>  <member><type>uint32_t</type> <name>maxGeometryTotalOutputComponents</name></member>   - <member><type>uint32_t</type> <name>maxFragmentInputComponents</name></member>  + <member><type>uint32_t</type> <name>maxFragmentInputComponents</name></member>  <member><type>uint32_t</type> <name>maxFragmentOutputAttachments</name></member>  <member><type>uint32_t</type> <name>maxFragmentDualSrcAttachments</name></member>  <member><type>uint32_t</type> <name>maxFragmentCombinedOutputResources</name></member> diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 0a5a77dcf3a..0daec103f2e 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -153,7 +153,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo dst->pApplicationInfo = src->pApplicationInfo; /* Application and loader can pass in a chain of extensions through pNext. - * We can't blindy pass these through as often these contain callbacks or + * 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. */ @@ -942,7 +942,7 @@ void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *na TRACE("%p %s\n", instance, debugstr_a(name)); /* Initial version of the Vulkan ICD spec required vkGetInstanceProcAddr to be - * exported. vk_icdGetInstanceProcAddr was added later to separete ICD calls from + * exported. vk_icdGetInstanceProcAddr was added later to separate ICD calls from * Vulkan API. One of them in our case should forward to the other, so just forward * to the older vkGetInstanceProcAddr. */ -- 2.16.1

3 2

[PATCH 1/2] winevulkan: Fix vkEnumerateInstanceExtensionProperties().
by Józef Kucia 16 Mar '18

16 Mar '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b9326baef6a3..a7f40f157d37 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -823,19 +823,14 @@ static VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *l if (wine_vk_instance_extension_supported(host_properties[i].extensionName)) { TRACE("Enabling extension '%s'\n", host_properties[i].extensionName); - memcpy(&properties[j], &host_properties[i], sizeof(*properties)); + properties[j] = host_properties[i]; j++; } } - - /* Return incomplete if the buffer is smaller than the number of supported extensions. */ - if (*count < num_properties) - res = VK_INCOMPLETE; - else - res = VK_SUCCESS; + *count = min(*count, num_properties); heap_free(host_properties); - return res; + return *count < num_properties ? VK_INCOMPLETE : VK_SUCCESS; } VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *count, -- 2.16.1

1 1

[PATCH] include: Add MmIsAddressValid to ddk/ntddk.h
by Alex Henrie 16 Mar '18

16 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Patch split off from https://github.com/wine-staging/wine-staging/blob/master/patches/ntoskrnl-D… Wine already has an implementation of this function, so adding it to the corresponding header file will benefit both programs compiled with Winelib and future Wine development. include/ddk/ntddk.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 5c124ca944..e76ccc9f8a 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -214,6 +214,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +BOOLEAN WINAPI MmIsAddressValid(void *); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); -- 2.16.2

2 2

[PATCH] wbemprox: Tweak a comment.
by Francois Gouget 16 Mar '18

16 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 33a951b0ca0..73f41927791 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3285,7 +3285,7 @@ static const WCHAR *get_installeddriver( UINT vendorid ) static const WCHAR driver_nvidiaW[] = {'n','v','d','3','d','u','m','.','d','l','l',0}; static const WCHAR driver_wineW[] = {'w','i','n','e','.','d','l','l',0}; - /* FIXME: wined3d has a better table, but we can not access this information through dxgi */ + /* FIXME: wined3d has a better table, but we cannot access this information through dxgi */ if (vendorid == HW_VENDOR_AMD) return driver_amdW; -- 2.16.1

2 1

[PATCH] comdlg32: Implement Places toolbar for file dialogs
by Nikolay Sivov 16 Mar '18

16 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comdlg32/comdlg32.rc | 26 ++++++++ dlls/comdlg32/filedlg.c | 141 ++++++++++++++++++++++++++++++++--------- dlls/comdlg32/filedlgbrowser.h | 1 + include/commdlg.h | 2 + 4 files changed, 140 insertions(+), 30 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 44e3d58cfd..0dc2b48bde 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -478,6 +478,32 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Help", pshHelp,222,145,54,14 } +NEWFILEOPENV2ORD DIALOG 0, 0, 370, 237 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "Open" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Look &in:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY + COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY + EDITTEXT IDC_FILENAME, 123, 180, 180, 12, ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 123, 180, 180, 150 + + LTEXT "Files of &type:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY + COMBOBOX IDC_FILETYPE, 123, 198, 180, 53, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "Open as &read-only", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 + + DEFPUSHBUTTON "&Open", IDOK, 310, 180, 54, 14 + PUSHBUTTON "Cancel", IDCANCEL, 310, 198, 54, 14 + PUSHBUTTON "&Help", pshHelp, 310, 215, 54, 14 +} + NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | WS_THICKFRAME diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 2ad7efa80e..8d989bc6f6 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -122,6 +122,10 @@ typedef struct tagLookInInfo /* Undefined windows message sent by CreateViewObject*/ #define WM_GETISHELLBROWSER WM_USER+7 +#define TBPLACES_CMDID_DESKTOP 0xa065 +#define TBPLACES_CMDID_MYDOCS 0xa066 +#define TBPLACES_CMDID_MYCOMPUTER 0xa067 + /* NOTE * Those macros exist in windowsx.h. However, you can't really use them since * they rely on the UNICODE defines and can't be used inside Wine itself. @@ -197,7 +201,6 @@ static LRESULT FILEDLG95_SHELL_Init(HWND hwnd); static BOOL FILEDLG95_SHELL_UpFolder(HWND hwnd); static BOOL FILEDLG95_SHELL_ExecuteCommand(HWND hwnd, LPCSTR lpVerb); static void FILEDLG95_SHELL_Clean(HWND hwnd); -static BOOL FILEDLG95_SHELL_BrowseToDesktop(HWND hwnd); /* Functions used by the EDIT box */ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed); @@ -242,6 +245,13 @@ static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM static BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCount, UINT sizeUsed); static BOOL BrowseSelectedFolder(HWND hwnd); +static BOOL is_places_bar_enabled(const FileOpenDlgInfos *fodInfos) +{ + return (fodInfos->ofnInfos->lStructSize == sizeof(*fodInfos->ofnInfos) && + !(fodInfos->ofnInfos->FlagsEx & OFN_EX_NOPLACESBAR) && + (fodInfos->ofnInfos->Flags & OFN_EXPLORER)); +} + /*********************************************************************** * GetFileName95 * @@ -258,6 +268,7 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) void *template; HRSRC hRes; HANDLE hDlgTmpl = 0; + WORD templateid; /* test for missing functionality */ if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS) @@ -268,7 +279,12 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) /* Create the dialog from a template */ - if(!(hRes = FindResourceW(COMDLG32_hInstance,MAKEINTRESOURCEW(NEWFILEOPENORD),(LPCWSTR)RT_DIALOG))) + if (is_places_bar_enabled(fodInfos)) + templateid = NEWFILEOPENV2ORD; + else + templateid = NEWFILEOPENORD; + + if (!(hRes = FindResourceW(COMDLG32_hInstance, MAKEINTRESOURCEW(templateid), (LPCWSTR)RT_DIALOG))) { COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; @@ -1306,8 +1322,18 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l case WM_DESTROY: { FileOpenDlgInfos * fodInfos = get_filedlg_infoptr(hwnd); + HWND places_bar = GetDlgItem(hwnd, IDC_TOOLBARPLACES); + HIMAGELIST himl; + if (fodInfos && fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) MemDialogSize = fodInfos->sizedlg; + + if (places_bar) + { + himl = (HIMAGELIST)SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_GETIMAGELIST, 0, 0); + SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_SETIMAGELIST, 0, 0); + ImageList_Destroy(himl); + } RemovePropW(hwnd, filedlg_info_propnameW); return FALSE; } @@ -1395,8 +1421,8 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) RECT rectlook; HIMAGELIST toolbarImageList; - SHFILEINFOA shFileInfo; ITEMIDLIST *desktopPidl; + SHFILEINFOW fileinfo; FileOpenDlgInfos *fodInfos = get_filedlg_infoptr(hwnd); @@ -1465,17 +1491,66 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* Retrieve and add desktop icon to the toolbar */ toolbarImageList = (HIMAGELIST)SendMessageW(fodInfos->DlgInfos.hwndTB, TB_GETIMAGELIST, 0, 0L); SHGetSpecialFolderLocation(hwnd, CSIDL_DESKTOP, &desktopPidl); - SHGetFileInfoA((LPCSTR)desktopPidl, 0, &shFileInfo, sizeof(shFileInfo), + SHGetFileInfoW((const WCHAR *)desktopPidl, 0, &fileinfo, sizeof(fileinfo), SHGFI_PIDL | SHGFI_ICON | SHGFI_SMALLICON); - ImageList_AddIcon(toolbarImageList, shFileInfo.hIcon); + ImageList_AddIcon(toolbarImageList, fileinfo.hIcon); - DestroyIcon(shFileInfo.hIcon); + DestroyIcon(fileinfo.hIcon); CoTaskMemFree(desktopPidl); /* Finish Toolbar Construction */ SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSW, 9, (LPARAM) tbb); SendMessageW(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0); + if (is_places_bar_enabled(fodInfos)) + { + static const struct bar_place_descr + { + int csidl; + int cmdid; + } + default_places[] = + { + { CSIDL_DESKTOP, TBPLACES_CMDID_DESKTOP }, + { CSIDL_MYDOCUMENTS, TBPLACES_CMDID_MYDOCS }, + { CSIDL_DRIVES, TBPLACES_CMDID_MYCOMPUTER }, + }; + TBBUTTON tb = { 0 }; + HIMAGELIST himl; + RECT rect; + int i, cx; + + SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_BUTTONSTRUCTSIZE, 0, 0); + GetClientRect(GetDlgItem(hwnd, IDC_TOOLBARPLACES), &rect); + cx = rect.right - rect.left; + + SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_SETBUTTONWIDTH, 0, MAKELPARAM(cx, cx)); + + himl = ImageList_Create(GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), ILC_COLOR32, 4, 1); + for (i = 0; i < sizeof(default_places)/sizeof(default_places[0]); i++) + { + ITEMIDLIST *pidl; + + SHGetSpecialFolderLocation(NULL, default_places[i].csidl, &pidl); + memset(&fileinfo, 0, sizeof(fileinfo)); + SHGetFileInfoW((const WCHAR *)pidl, 0, &fileinfo, sizeof(fileinfo), + SHGFI_PIDL | SHGFI_DISPLAYNAME | SHGFI_ICON); + ImageList_AddIcon(himl, fileinfo.hIcon); + + tb.iBitmap = i; + tb.iString = (INT_PTR)fileinfo.szDisplayName; + tb.fsState = TBSTATE_ENABLED | TBSTATE_WRAP; + tb.idCommand = default_places[i].cmdid; + SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_ADDBUTTONSW, 1, (LPARAM)&tb); + + DestroyIcon(fileinfo.hIcon); + CoTaskMemFree(pidl); + } + + SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_SETIMAGELIST, 0, (LPARAM)himl); + SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_SETBUTTONSIZE, 0, MAKELPARAM(cx, cx * 3 / 4)); + } + /* Set the window text with the text specified in the OPENFILENAME structure */ if(fodInfos->title) { @@ -1818,6 +1893,25 @@ void FILEDLG95_Clean(HWND hwnd) FILEDLG95_LOOKIN_Clean(hwnd); FILEDLG95_SHELL_Clean(hwnd); } + + +/*********************************************************************** + * Browse to special folder + */ +static void filedlg_browse_to_specialfolder(const FileOpenDlgInfos *info, int csidl) +{ + LPITEMIDLIST pidl; + + TRACE("%p, %d\n", info->ShellInfos.hwndOwner, csidl); + + SHGetSpecialFolderLocation(0, csidl, &pidl); + IShellBrowser_BrowseObject(info->Shell.FOIShellBrowser, pidl, SBSP_ABSOLUTE); + if (info->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(info->ShellInfos.hwndOwner, CDN_FOLDERCHANGE); + + COMDLG32_SHFree(pidl); +} + /*********************************************************************** * FILEDLG95_OnWMCommand * @@ -1866,9 +1960,18 @@ static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam) case FCIDM_TB_REPORTVIEW: FILEDLG95_SHELL_ExecuteCommand(hwnd,CMDSTR_VIEWDETAILSA); break; - /* Details option button */ + case FCIDM_TB_DESKTOP: - FILEDLG95_SHELL_BrowseToDesktop(hwnd); + case TBPLACES_CMDID_DESKTOP: + filedlg_browse_to_specialfolder(fodInfos, CSIDL_DESKTOP); + break; + + case TBPLACES_CMDID_MYDOCS: + filedlg_browse_to_specialfolder(fodInfos, CSIDL_MYDOCUMENTS); + break; + + case TBPLACES_CMDID_MYCOMPUTER: + filedlg_browse_to_specialfolder(fodInfos, CSIDL_DRIVES); break; case edt1: @@ -2841,28 +2944,6 @@ static BOOL FILEDLG95_SHELL_UpFolder(HWND hwnd) } return FALSE; } - -/*********************************************************************** - * FILEDLG95_SHELL_BrowseToDesktop - * - * Browse to the Desktop - * If the function succeeds, the return value is nonzero. - */ -static BOOL FILEDLG95_SHELL_BrowseToDesktop(HWND hwnd) -{ - FileOpenDlgInfos *fodInfos = get_filedlg_infoptr(hwnd); - LPITEMIDLIST pidl; - HRESULT hres; - - TRACE("\n"); - - SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidl); - hres = IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidl, SBSP_ABSOLUTE); - if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) - SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); - COMDLG32_SHFree(pidl); - return SUCCEEDED(hres); -} /*********************************************************************** * FILEDLG95_SHELL_Clean * diff --git a/dlls/comdlg32/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h index 5cb5435b89..69790e9a75 100644 --- a/dlls/comdlg32/filedlgbrowser.h +++ b/dlls/comdlg32/filedlgbrowser.h @@ -131,6 +131,7 @@ typedef struct #define IDC_FILENAME edt1 #define IDC_TOOLBAR 1 +#define IDC_TOOLBARPLACES ctl1 /*********************************************************************** * Prototypes for the methods of the IShellBrowserImpl class diff --git a/include/commdlg.h b/include/commdlg.h index c059b19ec8..214badd085 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -65,6 +65,8 @@ extern "C" { #define OFN_DONTADDTORECENT 0x02000000 #define OFN_FORCESHOWHIDDEN 0x10000000 +#define OFN_EX_NOPLACESBAR 0x00000001 + #define OFN_SHAREFALLTHROUGH 2 #define OFN_SHARENOWARN 1 #define OFN_SHAREWARN 0 -- 2.16.2

1 0

[PATCH] comdlg32/tests: Remove a macro
by Nikolay Sivov 16 Mar '18

16 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comdlg32/tests/filedlg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index ff973a7903..fd78a64e13 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -939,29 +939,27 @@ static void test_resizable2(void) ofn.hInstance = GetModuleHandleA(NULL); ofn.lpTemplateName = "template1"; ofn.Flags = OFN_EXPLORER; -#define ISSIZABLE TRUE ret = GetOpenFileNameA(&ofn); - ok( ret == ISSIZABLE, "File Dialog should have been sizable\n"); + ok( ret == TRUE, "File Dialog should have been sizable\n"); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); ofn.Flags = OFN_EXPLORER | OFN_ENABLETEMPLATE; ret = GetOpenFileNameA(&ofn); - ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n"); + ok( !ret, "File Dialog should NOT have been sizable\n"); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); ofn.Flags = OFN_EXPLORER | OFN_ENABLETEMPLATEHANDLE; ofn.hInstance = LoadResource( GetModuleHandleA(NULL), FindResourceA( GetModuleHandleA(NULL), "template1", (LPSTR)RT_DIALOG)); ofn.lpTemplateName = NULL; ret = GetOpenFileNameA(&ofn); - ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n"); + ok( !ret, "File Dialog should NOT have been sizable\n"); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); ofn.Flags = OFN_EXPLORER | OFN_ENABLEHOOK; ret = GetOpenFileNameA(&ofn); - ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n"); + ok( !ret, "File Dialog should NOT have been sizable\n"); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); -#undef ISSIZABLE } static void test_mru(void) -- 2.16.2

1 0

[PATCH 4/5] winex11: Restore the X11DRV_FLUSH_GL_DRAWABLE XFlush() for setups without OML_sync_control.
by Henri Verbeet 16 Mar '18

16 Mar '18

This was removed in e75bc6228ebcbdc1a3877a6ac6954611dedf8a71, but appears to mitigate lack of OML_sync_control in at least some setups. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/opengl.c | 3 +++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index be5537127a2..fc7972c62fe 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -259,6 +259,7 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d RECT rect = physDev->dc_rect; OffsetRect( &rect, -physDev->dc_rect.left, -physDev->dc_rect.top ); + if (data->flush) XFlush( gdi_display ); XSetFunction( gdi_display, physDev->gc, GXcopy ); XCopyArea( gdi_display, data->gl_drawable, physDev->drawable, physDev->gc, 0, 0, rect.right, rect.bottom, diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 01b92e3a099..7aa6448fedb 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1976,6 +1976,7 @@ static void wglFinish(void) escape.code = X11DRV_FLUSH_GL_DRAWABLE; escape.gl_drawable = 0; + escape.flush = FALSE; if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) { @@ -2001,6 +2002,7 @@ static void wglFlush(void) escape.code = X11DRV_FLUSH_GL_DRAWABLE; escape.gl_drawable = 0; + escape.flush = FALSE; if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) { @@ -3286,6 +3288,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) escape.code = X11DRV_FLUSH_GL_DRAWABLE; escape.gl_drawable = 0; + escape.flush = !pglXWaitForSbcOML; if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index abd069e1b42..6781d6073a7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -304,6 +304,7 @@ struct x11drv_escape_flush_gl_drawable { enum x11drv_escape_codes code; /* escape code (X11DRV_FLUSH_GL_DRAWABLE) */ Drawable gl_drawable; /* GL drawable */ + BOOL flush; /* flush X11 before copying */ }; /************************************************************************** -- 2.11.0

1 0

[PATCH 3/5] wined3d: Merge wined3d_texture_init() into texture_init().
by Henri Verbeet 16 Mar '18

16 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 169 ++++++++++++++++++++++--------------------------- 1 file changed, 75 insertions(+), 94 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a5fc3fe8d88..ba0fa63e80d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -343,92 +343,6 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su data->buffer_object = 0; } -static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, - UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, DWORD flags, - struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, - const struct wined3d_resource_ops *resource_ops) -{ - unsigned int i, j, size, offset = 0; - const struct wined3d_format *format; - HRESULT hr; - - TRACE("texture %p, texture_ops %p, layer_count %u, level_count %u, resource_type %s, format %s, " - "multisample_type %#x, multisample_quality %#x, usage %s, access %s, width %u, height %u, depth %u, " - "flags %#x, device %p, parent %p, parent_ops %p, resource_ops %p.\n", - texture, texture_ops, layer_count, level_count, debug_d3dresourcetype(desc->resource_type), - debug_d3dformat(desc->format), desc->multisample_type, desc->multisample_quality, - debug_d3dusage(desc->usage), wined3d_debug_resource_access(desc->access), - desc->width, desc->height, desc->depth, flags, device, parent, parent_ops, resource_ops); - - if (!desc->width || !desc->height || !desc->depth) - return WINED3DERR_INVALIDCALL; - - format = wined3d_get_format(&device->adapter->gl_info, desc->format, desc->usage); - - for (i = 0; i < layer_count; ++i) - { - for (j = 0; j < level_count; ++j) - { - unsigned int idx = i * level_count + j; - - size = wined3d_format_calculate_size(format, device->surface_alignment, - max(1, desc->width >> j), max(1, desc->height >> j), max(1, desc->depth >> j)); - texture->sub_resources[idx].offset = offset; - texture->sub_resources[idx].size = size; - offset += size; - } - offset = (offset + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1); - } - - if (!offset) - return WINED3DERR_INVALIDCALL; - - if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, - desc->multisample_type, desc->multisample_quality, desc->usage, desc->access, - desc->width, desc->height, desc->depth, offset, parent, parent_ops, resource_ops))) - { - static unsigned int once; - - /* DXTn 3D textures are not supported. Do not write the ERR for them. */ - if ((desc->format == WINED3DFMT_DXT1 || desc->format == WINED3DFMT_DXT2 || desc->format == WINED3DFMT_DXT3 - || desc->format == WINED3DFMT_DXT4 || desc->format == WINED3DFMT_DXT5) - && !(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE) - && desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !once++) - ERR_(winediag)("The application tried to create a DXTn texture, but the driver does not support them.\n"); - - WARN("Failed to initialize resource, returning %#x\n", hr); - return hr; - } - wined3d_resource_update_draw_binding(&texture->resource); - if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) || desc->format == WINED3DFMT_D16_LOCKABLE) - texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; - - texture->texture_ops = texture_ops; - - texture->layer_count = layer_count; - texture->level_count = level_count; - texture->lod = 0; - texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS; - if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT) - texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_GET_DC_LENIENT; - if (flags & (WINED3D_TEXTURE_CREATE_GET_DC | WINED3D_TEXTURE_CREATE_GET_DC_LENIENT)) - texture->flags |= WINED3D_TEXTURE_GET_DC; - if (flags & WINED3D_TEXTURE_CREATE_DISCARD) - texture->flags |= WINED3D_TEXTURE_DISCARD; - if (flags & WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS) - { - if (!(texture->resource.format_flags & WINED3DFMT_FLAG_GEN_MIPMAP)) - WARN("Format doesn't support mipmaps generation, " - "ignoring WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag.\n"); - else - texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; - } - - list_init(&texture->renderbuffers); - - return WINED3D_OK; -} - /* Context activation is done by the caller. */ static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) @@ -2173,16 +2087,28 @@ static const struct wined3d_resource_ops texture_resource_ops = texture_resource_sub_resource_unmap, }; -static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, +static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_texture_ops *texture_ops) { struct wined3d_device_parent *device_parent = device->device_parent; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - UINT pow2_width, pow2_height; - unsigned int sub_count, i; + unsigned int sub_count, i, j, size, offset = 0; + unsigned int pow2_width, pow2_height; + const struct wined3d_format *format; HRESULT hr; + TRACE("texture %p, resource_type %s, format %s, multisample_type %#x, multisample_quality %#x, " + "usage %s, access %s, width %u, height %u, depth %u, layer_count %u, level_count %u, " + "flags %#x, device %p, parent %p, parent_ops %p, texture_ops %p.\n", + texture, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format), + desc->multisample_type, desc->multisample_quality, debug_d3dusage(desc->usage), + wined3d_debug_resource_access(desc->access), desc->width, desc->height, desc->depth, + layer_count, level_count, flags, device, parent, parent_ops, texture_ops); + + if (!desc->width || !desc->height || !desc->depth) + return WINED3DERR_INVALIDCALL; + if (desc->resource_type == WINED3D_RTYPE_TEXTURE_3D) { if (layer_count != 1) @@ -2295,12 +2221,67 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 TRACE("Creating an oversized (%ux%u) surface.\n", pow2_width, pow2_height); } - if (FAILED(hr = wined3d_texture_init(texture, texture_ops, layer_count, level_count, desc, - flags, device, parent, parent_ops, &texture_resource_ops))) + format = wined3d_get_format(&device->adapter->gl_info, desc->format, desc->usage); + for (i = 0; i < layer_count; ++i) { - WARN("Failed to initialize texture, returning %#x.\n", hr); + for (j = 0; j < level_count; ++j) + { + unsigned int idx = i * level_count + j; + + size = wined3d_format_calculate_size(format, device->surface_alignment, + max(1, desc->width >> j), max(1, desc->height >> j), max(1, desc->depth >> j)); + texture->sub_resources[idx].offset = offset; + texture->sub_resources[idx].size = size; + offset += size; + } + offset = (offset + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1); + } + + if (!offset) + return WINED3DERR_INVALIDCALL; + + if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, + desc->multisample_type, desc->multisample_quality, desc->usage, desc->access, + desc->width, desc->height, desc->depth, offset, parent, parent_ops, &texture_resource_ops))) + { + static unsigned int once; + + /* DXTn 3D textures are not supported. Do not write the ERR for them. */ + if ((desc->format == WINED3DFMT_DXT1 || desc->format == WINED3DFMT_DXT2 || desc->format == WINED3DFMT_DXT3 + || desc->format == WINED3DFMT_DXT4 || desc->format == WINED3DFMT_DXT5) + && !(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE) + && desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !once++) + ERR_(winediag)("The application tried to create a DXTn texture, but the driver does not support them.\n"); + + WARN("Failed to initialize resource, returning %#x\n", hr); return hr; } + wined3d_resource_update_draw_binding(&texture->resource); + if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) || desc->format == WINED3DFMT_D16_LOCKABLE) + texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + + texture->texture_ops = texture_ops; + + texture->layer_count = layer_count; + texture->level_count = level_count; + texture->lod = 0; + texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS; + if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT) + texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_GET_DC_LENIENT; + if (flags & (WINED3D_TEXTURE_CREATE_GET_DC | WINED3D_TEXTURE_CREATE_GET_DC_LENIENT)) + texture->flags |= WINED3D_TEXTURE_GET_DC; + if (flags & WINED3D_TEXTURE_CREATE_DISCARD) + texture->flags |= WINED3D_TEXTURE_DISCARD; + if (flags & WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS) + { + if (!(texture->resource.format_flags & WINED3DFMT_FLAG_GEN_MIPMAP)) + WARN("Format doesn't support mipmaps generation, " + "ignoring WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag.\n"); + else + texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; + } + + list_init(&texture->renderbuffers); /* Precalculated scaling for 'faked' non power of two texture coords. */ if (texture->resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) @@ -3000,12 +2981,12 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct switch (desc->resource_type) { case WINED3D_RTYPE_TEXTURE_2D: - hr = texture_init(object, desc, layer_count, level_count, + hr = wined3d_texture_init(object, desc, layer_count, level_count, flags, device, parent, parent_ops, &texture2d_ops); break; case WINED3D_RTYPE_TEXTURE_3D: - hr = texture_init(object, desc, layer_count, level_count, + hr = wined3d_texture_init(object, desc, layer_count, level_count, flags, device, parent, parent_ops, &texture3d_ops); break; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Merge volumetexture_init() and texture_init().
by Henri Verbeet 16 Mar '18

16 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 160 +++++++++++++------------------------------------ 1 file changed, 40 insertions(+), 120 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cf1d091db4b..a5fc3fe8d88 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2175,7 +2175,7 @@ static const struct wined3d_resource_ops texture_resource_ops = static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device, - void *parent, const struct wined3d_parent_ops *parent_ops) + void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_texture_ops *texture_ops) { struct wined3d_device_parent *device_parent = device->device_parent; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -2183,6 +2183,21 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 unsigned int sub_count, i; HRESULT hr; + if (desc->resource_type == WINED3D_RTYPE_TEXTURE_3D) + { + if (layer_count != 1) + { + ERR("Invalid layer count for volume texture.\n"); + return E_INVALIDARG; + } + + if (!gl_info->supported[EXT_TEXTURE3D]) + { + WARN("OpenGL implementation does not support 3D textures.\n"); + return WINED3DERR_INVALIDCALL; + } + } + if (!(desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) && layer_count > 1 && !gl_info->supported[EXT_TEXTURE_ARRAY]) { @@ -2194,7 +2209,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 * that are reported as supported. */ if (WINED3DFMT_UNKNOWN >= desc->format) { - WARN("(%p) : Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n", texture); + WARN("Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n"); return WINED3DERR_INVALIDCALL; } @@ -2214,15 +2229,16 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 pow2_width = desc->width; pow2_height = desc->height; - if (((desc->width & (desc->width - 1)) || (desc->height & (desc->height - 1))) + if (((desc->width & (desc->width - 1)) || (desc->height & (desc->height - 1)) || (desc->depth & (desc->depth - 1))) && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) { /* level_count == 0 returns an error as well. */ - if (level_count != 1 || layer_count != 1) + if (level_count != 1 || layer_count != 1 || desc->resource_type == WINED3D_RTYPE_TEXTURE_3D) { if (!(desc->usage & WINED3DUSAGE_SCRATCH)) { - WARN("Attempted to create a mipmapped/cube/array NPOT texture without unconditional NPOT support.\n"); + WARN("Attempted to create a mipmapped/cube/array/volume NPOT " + "texture without unconditional NPOT support.\n"); return WINED3DERR_INVALIDCALL; } @@ -2230,7 +2246,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } texture->flags |= WINED3D_TEXTURE_COND_NP2; - if (!gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !gl_info->supported[ARB_TEXTURE_RECTANGLE] + && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format, desc->usage); @@ -2278,7 +2295,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 TRACE("Creating an oversized (%ux%u) surface.\n", pow2_width, pow2_height); } - if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, layer_count, level_count, desc, + if (FAILED(hr = wined3d_texture_init(texture, texture_ops, layer_count, level_count, desc, flags, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); @@ -2306,7 +2323,11 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->pow2_matrix[0] = 1.0f; texture->pow2_matrix[5] = 1.0f; } - if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) + if (desc->resource_type == WINED3D_RTYPE_TEXTURE_3D) + { + texture->target = GL_TEXTURE_3D; + } + else if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) { texture->target = GL_TEXTURE_CUBE_MAP_ARB; } @@ -2330,7 +2351,12 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 TRACE("x scale %.8e, y scale %.8e.\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); if (wined3d_texture_use_pbo(texture, gl_info)) + { + if (desc->resource_type == WINED3D_RTYPE_TEXTURE_3D + || (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + wined3d_resource_free_sysmem(&texture->resource); texture->resource.map_binding = WINED3D_LOCATION_BUFFER; + } sub_count = level_count * layer_count; if (sub_count / layer_count != level_count) @@ -2361,7 +2387,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 sub_resource = &texture->sub_resources[i]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; - if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D + && !(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) { wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_SYSMEM); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_SYSMEM); @@ -2677,115 +2704,6 @@ static const struct wined3d_texture_ops texture3d_ops = texture3d_prepare_texture, }; -static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, - UINT layer_count, UINT level_count, DWORD flags, struct wined3d_device *device, void *parent, - const struct wined3d_parent_ops *parent_ops) -{ - struct wined3d_device_parent *device_parent = device->device_parent; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - unsigned int i; - HRESULT hr; - - if (layer_count != 1) - { - ERR("Invalid layer count for volume texture.\n"); - return E_INVALIDARG; - } - - /* TODO: It should only be possible to create textures for formats - * that are reported as supported. */ - if (WINED3DFMT_UNKNOWN >= desc->format) - { - WARN("(%p) : Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n", texture); - return WINED3DERR_INVALIDCALL; - } - - if (!gl_info->supported[EXT_TEXTURE3D]) - { - WARN("(%p) : Texture cannot be created - no volume texture support.\n", texture); - return WINED3DERR_INVALIDCALL; - } - - if (desc->usage & WINED3DUSAGE_DYNAMIC && (wined3d_resource_access_is_managed(desc->access) - || desc->usage & WINED3DUSAGE_SCRATCH)) - { - WARN("Attempted to create a DYNAMIC texture with access %s.\n", - wined3d_debug_resource_access(desc->access)); - return WINED3DERR_INVALIDCALL; - } - - if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) - { - UINT pow2_w, pow2_h, pow2_d; - pow2_w = 1; - while (pow2_w < desc->width) - pow2_w <<= 1; - pow2_h = 1; - while (pow2_h < desc->height) - pow2_h <<= 1; - pow2_d = 1; - while (pow2_d < desc->depth) - pow2_d <<= 1; - - if (pow2_w != desc->width || pow2_h != desc->height || pow2_d != desc->depth) - { - if (desc->usage & WINED3DUSAGE_SCRATCH) - { - WARN("Creating a scratch NPOT volume texture despite lack of HW support.\n"); - } - else - { - WARN("Attempted to create a NPOT volume texture (%u, %u, %u) without GL support.\n", - desc->width, desc->height, desc->depth); - return WINED3DERR_INVALIDCALL; - } - } - } - - if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, level_count, desc, - flags, device, parent, parent_ops, &texture_resource_ops))) - { - WARN("Failed to initialize texture, returning %#x.\n", hr); - return hr; - } - - texture->pow2_matrix[0] = 1.0f; - texture->pow2_matrix[5] = 1.0f; - texture->pow2_matrix[10] = 1.0f; - texture->pow2_matrix[15] = 1.0f; - texture->target = GL_TEXTURE_3D; - - if (wined3d_texture_use_pbo(texture, gl_info)) - { - wined3d_resource_free_sysmem(&texture->resource); - texture->resource.map_binding = WINED3D_LOCATION_BUFFER; - } - - /* Generate all the sub resources. */ - for (i = 0; i < texture->level_count; ++i) - { - struct wined3d_texture_sub_resource *sub_resource; - - sub_resource = &texture->sub_resources[i]; - sub_resource->locations = WINED3D_LOCATION_DISCARDED; - - if (FAILED(hr = device_parent->ops->texture_sub_resource_created(device_parent, - desc->resource_type, texture, i, &sub_resource->parent, &sub_resource->parent_ops))) - { - WARN("Failed to create volume parent, hr %#x.\n", hr); - sub_resource->parent = NULL; - wined3d_texture_cleanup_sync(texture); - return hr; - } - - TRACE("parent %p, parent_ops %p.\n", parent, parent_ops); - - TRACE("Created volume level %u.\n", i); - } - - return WINED3D_OK; -} - HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) @@ -3082,11 +3000,13 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct switch (desc->resource_type) { case WINED3D_RTYPE_TEXTURE_2D: - hr = texture_init(object, desc, layer_count, level_count, flags, device, parent, parent_ops); + hr = texture_init(object, desc, layer_count, level_count, + flags, device, parent, parent_ops, &texture2d_ops); break; case WINED3D_RTYPE_TEXTURE_3D: - hr = volumetexture_init(object, desc, layer_count, level_count, flags, device, parent, parent_ops); + hr = texture_init(object, desc, layer_count, level_count, + flags, device, parent, parent_ops, &texture3d_ops); break; default: -- 2.11.0

1 0

[PATCH 1/5] wined3d: Merge the surface_created() and volume_created() wined3d_device_parent_ops callbacks.
by Henri Verbeet 16 Mar '18

16 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 13 ++++++------ dlls/d3d8/device.c | 57 +++++++++++++++++++++++++------------------------- dlls/d3d9/device.c | 57 +++++++++++++++++++++++++------------------------- dlls/ddraw/ddraw.c | 27 +++++++----------------- dlls/wined3d/texture.c | 8 +++---- include/wine/wined3d.h | 7 ++----- 6 files changed, 75 insertions(+), 94 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 25308c29801..d93f4ebe734 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5786,12 +5786,12 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa TRACE("device_parent %p, activate %#x.\n", device_parent, activate); } -static HRESULT CDECL device_parent_sub_resource_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent, - const struct wined3d_parent_ops **parent_ops) +static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_device_parent *device_parent, + enum wined3d_resource_type type, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, + void **parent, const struct wined3d_parent_ops **parent_ops) { - TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); + TRACE("device_parent %p, type %#x, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, type, wined3d_texture, sub_resource_idx, parent, parent_ops); *parent = NULL; *parent_ops = &d3d_null_wined3d_parent_ops; @@ -5881,8 +5881,7 @@ static const struct wined3d_device_parent_ops d3d_wined3d_device_parent_ops = device_parent_wined3d_device_created, device_parent_mode_changed, device_parent_activate, - device_parent_sub_resource_created, - device_parent_sub_resource_created, + device_parent_texture_sub_resource_created, device_parent_create_swapchain_texture, device_parent_create_swapchain, }; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 17e02a3b1c6..367f5c1c4f5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3269,40 +3269,40 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa InterlockedCompareExchange(&device->device_state, D3D8_DEVICE_STATE_NOT_RESET, D3D8_DEVICE_STATE_LOST); } -static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, +static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_device_parent *device_parent, + enum wined3d_resource_type type, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops) { - struct d3d8_surface *d3d_surface; - - TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); - - if (!(d3d_surface = heap_alloc_zero(sizeof(*d3d_surface)))) - return E_OUTOFMEMORY; - - surface_init(d3d_surface, wined3d_texture, sub_resource_idx, parent_ops); - *parent = d3d_surface; - TRACE("Created surface %p.\n", d3d_surface); + TRACE("device_parent %p, type %#x, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, type, wined3d_texture, sub_resource_idx, parent, parent_ops); - return D3D_OK; -} + if (type == WINED3D_RTYPE_TEXTURE_2D) + { + struct d3d8_surface *d3d_surface; -static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - void **parent, const struct wined3d_parent_ops **parent_ops) -{ - struct d3d8_volume *d3d_volume; + if (!(d3d_surface = heap_alloc_zero(sizeof(*d3d_surface)))) + return E_OUTOFMEMORY; - TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); + surface_init(d3d_surface, wined3d_texture, sub_resource_idx, parent_ops); + *parent = d3d_surface; + TRACE("Created surface %p.\n", d3d_surface); + } + else if (type == WINED3D_RTYPE_TEXTURE_3D) + { + struct d3d8_volume *d3d_volume; - if (!(d3d_volume = heap_alloc_zero(sizeof(*d3d_volume)))) - return E_OUTOFMEMORY; + if (!(d3d_volume = heap_alloc_zero(sizeof(*d3d_volume)))) + return E_OUTOFMEMORY; - volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); - *parent = d3d_volume; - TRACE("Created volume %p.\n", d3d_volume); + volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); + *parent = d3d_volume; + TRACE("Created volume %p.\n", d3d_volume); + } + else + { + ERR("Unhandled resource type %#x.\n", type); + return E_FAIL; + } return D3D_OK; } @@ -3360,8 +3360,7 @@ static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops = device_parent_wined3d_device_created, device_parent_mode_changed, device_parent_activate, - device_parent_surface_created, - device_parent_volume_created, + device_parent_texture_sub_resource_created, device_parent_create_swapchain_texture, device_parent_create_swapchain, }; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8c74494638c..457a0cdca9c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4107,40 +4107,40 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa InterlockedCompareExchange(&device->device_state, D3D9_DEVICE_STATE_NOT_RESET, D3D9_DEVICE_STATE_LOST); } -static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, +static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_device_parent *device_parent, + enum wined3d_resource_type type, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops) { - struct d3d9_surface *d3d_surface; - - TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); + TRACE("device_parent %p, type %#x, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, type, wined3d_texture, sub_resource_idx, parent, parent_ops); - if (!(d3d_surface = heap_alloc_zero(sizeof(*d3d_surface)))) - return E_OUTOFMEMORY; + if (type == WINED3D_RTYPE_TEXTURE_2D) + { + struct d3d9_surface *d3d_surface; - surface_init(d3d_surface, wined3d_texture, sub_resource_idx, parent_ops); - *parent = d3d_surface; - TRACE("Created surface %p.\n", d3d_surface); + if (!(d3d_surface = heap_alloc_zero(sizeof(*d3d_surface)))) + return E_OUTOFMEMORY; - return D3D_OK; -} - -static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - void **parent, const struct wined3d_parent_ops **parent_ops) -{ - struct d3d9_volume *d3d_volume; - - TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); + surface_init(d3d_surface, wined3d_texture, sub_resource_idx, parent_ops); + *parent = d3d_surface; + TRACE("Created surface %p.\n", d3d_surface); + } + else if (type == WINED3D_RTYPE_TEXTURE_3D) + { + struct d3d9_volume *d3d_volume; - if (!(d3d_volume = heap_alloc_zero(sizeof(*d3d_volume)))) - return E_OUTOFMEMORY; + if (!(d3d_volume = heap_alloc_zero(sizeof(*d3d_volume)))) + return E_OUTOFMEMORY; - volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); - *parent = d3d_volume; - TRACE("Created volume %p.\n", d3d_volume); + volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); + *parent = d3d_volume; + TRACE("Created volume %p.\n", d3d_volume); + } + else + { + ERR("Unhandled resource type %#x.\n", type); + return E_FAIL; + } return D3D_OK; } @@ -4205,8 +4205,7 @@ static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops = device_parent_wined3d_device_created, device_parent_mode_changed, device_parent_activate, - device_parent_surface_created, - device_parent_volume_created, + device_parent_texture_sub_resource_created, device_parent_create_swapchain_texture, device_parent_create_swapchain, }; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 97a11ef1ef7..791e1498f5c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4800,18 +4800,19 @@ void ddraw_update_lost_surfaces(struct ddraw *ddraw) ddraw->device_state = DDRAW_DEVICE_STATE_OK; } -static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, +static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_device_parent *device_parent, + enum wined3d_resource_type type, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); struct ddraw_surface *ddraw_surface; - TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); + TRACE("device_parent %p, type %#x, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, type, wined3d_texture, sub_resource_idx, parent, parent_ops); /* We have a swapchain or wined3d internal texture. */ - if (!wined3d_texture_get_parent(wined3d_texture) || wined3d_texture_get_parent(wined3d_texture) == ddraw) + if (type != WINED3D_RTYPE_TEXTURE_2D || !wined3d_texture_get_parent(wined3d_texture) + || wined3d_texture_get_parent(wined3d_texture) == ddraw) { *parent = NULL; *parent_ops = &ddraw_null_wined3d_parent_ops; @@ -4836,19 +4837,6 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent return DD_OK; } -static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - void **parent, const struct wined3d_parent_ops **parent_ops) -{ - TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); - - *parent = NULL; - *parent_ops = &ddraw_null_wined3d_parent_ops; - - return DD_OK; -} - static void STDMETHODCALLTYPE ddraw_frontbuffer_destroyed(void *parent) { struct ddraw *ddraw = parent; @@ -4914,8 +4902,7 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = device_parent_wined3d_device_created, device_parent_mode_changed, device_parent_activate, - device_parent_surface_created, - device_parent_volume_created, + device_parent_texture_sub_resource_created, device_parent_create_swapchain_texture, device_parent_create_swapchain, }; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e1f02a5f15b..cf1d091db4b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2367,8 +2367,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_SYSMEM); } - if (FAILED(hr = device_parent->ops->surface_created(device_parent, - texture, i, &sub_resource->parent, &sub_resource->parent_ops))) + if (FAILED(hr = device_parent->ops->texture_sub_resource_created(device_parent, + desc->resource_type, texture, i, &sub_resource->parent, &sub_resource->parent_ops))) { WARN("Failed to create sub-resource parent, hr %#x.\n", hr); sub_resource->parent = NULL; @@ -2769,8 +2769,8 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct sub_resource = &texture->sub_resources[i]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; - if (FAILED(hr = device_parent->ops->volume_created(device_parent, - texture, i, &sub_resource->parent, &sub_resource->parent_ops))) + if (FAILED(hr = device_parent->ops->texture_sub_resource_created(device_parent, + desc->resource_type, texture, i, &sub_resource->parent, &sub_resource->parent_ops))) { WARN("Failed to create volume parent, hr %#x.\n", hr); sub_resource->parent = NULL; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2b4f27438c8..a4b939c4e2c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2114,11 +2114,8 @@ struct wined3d_device_parent_ops void (__cdecl *wined3d_device_created)(struct wined3d_device_parent *device_parent, struct wined3d_device *device); void (__cdecl *mode_changed)(struct wined3d_device_parent *device_parent); void (__cdecl *activate)(struct wined3d_device_parent *device_parent, BOOL activate); - HRESULT (__cdecl *surface_created)(struct wined3d_device_parent *device_parent, - struct wined3d_texture *texture, unsigned int sub_resource_idx, - void **parent, const struct wined3d_parent_ops **parent_ops); - HRESULT (__cdecl *volume_created)(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, + HRESULT (__cdecl *texture_sub_resource_created)(struct wined3d_device_parent *device_parent, + enum wined3d_resource_type type, struct wined3d_texture *texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops); HRESULT (__cdecl *create_swapchain_texture)(struct wined3d_device_parent *device_parent, void *parent, const struct wined3d_resource_desc *desc, DWORD texture_flags, struct wined3d_texture **texture); -- 2.11.0

1 0

[PATCH resend] shell32/tests: Mark a shell dispatch test as todo on x64 and ARM
by Alex Henrie 16 Mar '18

16 Mar '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/tests/shelldispatch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index cc00757840..8186c0d0a2 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1010,6 +1010,9 @@ static void test_ShellWindows(void) hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, &IID_IShellWindows, (void**)&shellwindows); +#ifndef __i386__ +todo_wine +#endif ok(hr == S_OK, "got 0x%08x\n", hr); /* TODO: remove when explorer startup with clean prefix is fixed */ if (hr != S_OK) -- 2.16.2

1 0

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

16 Mar '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/player.c | 82 ++++++++++++++++++++++++++++--- 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, 208 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..03f5d8f2be 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,54 @@ 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 (!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 +1789,34 @@ 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) +{ + assert(iface->lpVtbl == &WMPMediaVtbl); + return CONTAINING_RECORD(iface, WMPMedia, IWMPMedia_iface); +} +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 937960cbaf..8bcfa4827d 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

1 6

[PATCH 3/3] dmime: Reimplement the segment form parser
by Michael Stefaniuc 16 Mar '18

16 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/segment.c | 157 +++++++++++++++++++++------------------------------ 1 file changed, 63 insertions(+), 94 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 88ca212c78..cbc2b3cf0a 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -819,20 +819,14 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DWORD StreamSize, IStream *pStm) { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, ListSize[3], ListCount[3]; + DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - if (pChunk->fccID != DMUS_FOURCC_TRACK_LIST) { - ERR_(dmfile)(": %s chunk should be a TRACK list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); + ListSize[0] = StreamSize - sizeof(FOURCC); ListCount[0] = 0; do { @@ -873,94 +867,69 @@ static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSize, IStream *pStm) -{ - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamCount; - LARGE_INTEGER liMove; /* used when skipping chunks */ - - StreamSize -= sizeof(FOURCC); - StreamCount = 0; +static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size) +{ + unsigned int dx = 9; + + if (size == offsetof(DMUS_IO_SEGMENT_HEADER, rtLength)) + dx = 7; + else if (size == offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart)) + dx = 8; + TRACE("Found DirectX%d DMUS_IO_SEGMENT_HEADER\n", dx); + TRACE("\tdwRepeats: %u\n", h->dwRepeats); + TRACE("\tmtLength: %u\n", h->mtLength); + TRACE("\tmtPlayStart: %u\n", h->mtPlayStart); + TRACE("\tmtLoopStart: %u\n", h->mtLoopStart); + TRACE("\tmtLoopEnd: %u\n", h->mtLoopEnd); + TRACE("\tdwResolution: %u\n", h->dwResolution); + if (dx >= 8) { + TRACE("\trtLength: %s\n", wine_dbgstr_longlong(h->rtLength)); + TRACE("\tdwFlags: %u\n", h->dwFlags); + TRACE("\tdwReserved: %u\n", h->dwReserved); + } + if (dx == 9) { + TRACE("\trtLoopStart: %s\n", wine_dbgstr_longlong(h->rtLoopStart)); + TRACE("\trtLoopEnd: %s\n", wine_dbgstr_longlong(h->rtLoopEnd)); + TRACE("\trtPlayStart: %s\n", wine_dbgstr_longlong(h->rtPlayStart)); + } +} - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); +static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *stream, + const struct chunk_entry *riff) +{ + struct chunk_entry chunk = {.parent = riff}; + HRESULT hr; - switch (Chunk.fccID) { - case DMUS_FOURCC_SEGMENT_CHUNK: { - DWORD checkSz = sizeof(FOURCC); - TRACE_(dmfile)(": segment chunk\n"); - /** DX 7 */ - IStream_Read (pStm, &This->header.dwRepeats, sizeof(This->header.dwRepeats), NULL); - checkSz += sizeof(This->header.dwRepeats); - IStream_Read (pStm, &This->header.mtLength, sizeof(This->header.mtLength), NULL); - checkSz += sizeof(This->header.mtLength); - IStream_Read (pStm, &This->header.mtPlayStart, sizeof(This->header.mtPlayStart), NULL); - checkSz += sizeof(This->header.mtPlayStart); - IStream_Read (pStm, &This->header.mtLoopStart, sizeof(This->header.mtLoopStart), NULL); - checkSz += sizeof(This->header.mtLoopStart); - IStream_Read (pStm, &This->header.mtLoopEnd, sizeof(This->header.mtLoopEnd), NULL); - checkSz += sizeof(This->header.mtLoopEnd); - IStream_Read (pStm, &This->header.dwResolution, sizeof(This->header.dwResolution), NULL); - checkSz += sizeof(This->header.dwResolution); - TRACE_(dmfile)("dwRepeats: %u\n", This->header.dwRepeats); - TRACE_(dmfile)("mtLength: %u\n", This->header.mtLength); - TRACE_(dmfile)("mtPlayStart: %u\n", This->header.mtPlayStart); - TRACE_(dmfile)("mtLoopStart: %u\n", This->header.mtLoopStart); - TRACE_(dmfile)("mtLoopEnd: %u\n", This->header.mtLoopEnd); - TRACE_(dmfile)("dwResolution: %u\n", This->header.dwResolution); - /** DX 8 */ - if (Chunk.dwSize > checkSz) { - IStream_Read (pStm, &This->header.rtLength, sizeof(This->header.rtLength), NULL); - checkSz += sizeof(This->header.rtLength); - IStream_Read (pStm, &This->header.dwFlags, sizeof(This->header.dwFlags), NULL); - checkSz += sizeof(This->header.dwFlags); - } - /** DX 9 */ - if (Chunk.dwSize > checkSz) { - IStream_Read (pStm, &This->header.rtLoopStart, sizeof(This->header.rtLoopStart), NULL); - checkSz += sizeof(This->header.rtLoopStart); - IStream_Read (pStm, &This->header.rtLoopEnd, sizeof(This->header.rtLoopEnd), NULL); - checkSz += sizeof(This->header.rtLoopEnd); - IStream_Read (pStm, &This->header.rtPlayStart, sizeof(This->header.rtPlayStart), NULL); - checkSz += sizeof(This->header.rtPlayStart); - } - liMove.QuadPart = Chunk.dwSize - checkSz + sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - switch (Chunk.fccID) { - case DMUS_FOURCC_TRACK_LIST: { - TRACE_(dmfile)(": TRACK list\n"); - hr = parse_track_list(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(riff)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + switch (chunk.id) { + case DMUS_FOURCC_SEGMENT_CHUNK: + /* DX7, DX8 and DX9 structure sizes */ + if (chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLength) && + chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart) && + chunk.size != sizeof(DMUS_IO_SEGMENT_HEADER)) { + WARN("Invalid size of %s\n", debugstr_chunk(&chunk)); + break; + } + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &This->header, chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + dump_segment_header(&This->header, chunk.size); + break; + case FOURCC_LIST: + if (chunk.type == DMUS_FOURCC_TRACK_LIST) + if (FAILED(hr = parse_track_list(This, chunk.size, stream))) + return hr; + break; + case FOURCC_RIFF: + FIXME("Loading of embedded RIFF form %s", debugstr_fourcc(chunk.type)); + break; + } } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - return S_OK; + return SUCCEEDED(hr) ? S_OK : hr; } static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream *iface) @@ -990,7 +959,7 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *st stream_reset_chunk_data(stream, &riff); if (riff.type == DMUS_FOURCC_SEGMENT_FORM) - hr = parse_segment_form(This, riff.size, stream); + hr = parse_segment_form(This, stream, &riff); else { FIXME("WAVE form loading not implemented\n"); hr = S_OK; -- 2.14.3

1 0

[PATCH 2/3] dmime: The descriptor is already parsed for the segment form
by Michael Stefaniuc 16 Mar '18

16 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/dmutils.c | 55 ---------------------------------------------------- dlls/dmime/dmutils.h | 2 -- dlls/dmime/segment.c | 36 ++-------------------------------- 3 files changed, 2 insertions(+), 91 deletions(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 75a62a4e8e..9bb8df366b 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -92,61 +92,6 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* p return S_OK; } -HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { - - LARGE_INTEGER liMove; /* used when skipping chunks */ - - /** - * don't ask me why, but M$ puts INFO elements in UNFO list sometimes - * (though strings seem to be valid unicode) - */ - switch (pChunk->fccID) { - - case mmioFOURCC('I','N','A','M'): - case DMUS_FOURCC_UNAM_CHUNK: { - TRACE(": name chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); - TRACE(" - wszName: %s\n", debugstr_w(pDesc->wszName)); - break; - } - - case mmioFOURCC('I','A','R','T'): - case DMUS_FOURCC_UART_CHUNK: { - TRACE(": artist chunk (ignored)\n"); - liMove.QuadPart = pChunk->dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','O','P'): - case DMUS_FOURCC_UCOP_CHUNK: { - TRACE(": copyright chunk (ignored)\n"); - liMove.QuadPart = pChunk->dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','S','B','J'): - case DMUS_FOURCC_USBJ_CHUNK: { - TRACE(": subject chunk (ignored)\n"); - liMove.QuadPart = pChunk->dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','M','T'): - case DMUS_FOURCC_UCMT_CHUNK: { - TRACE(": comment chunk (ignored)\n"); - liMove.QuadPart = pChunk->dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - default: - /* not handled */ - return S_FALSE; - } - - return S_OK; -} - HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) { DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; diff --git a/dlls/dmime/dmutils.h b/dlls/dmime/dmutils.h index e2902875dc..187c9ed3d4 100644 --- a/dlls/dmime/dmutils.h +++ b/dlls/dmime/dmutils.h @@ -30,8 +30,6 @@ typedef struct _DMUS_PRIVATE_CHUNK { /** * Parsing utilities */ -extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; -extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; /** diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 3122d2207a..88ca212c78 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -877,7 +877,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSi { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamCount, ListSize[3], ListCount[3]; + DWORD StreamCount; LARGE_INTEGER liMove; /* used when skipping chunks */ StreamSize -= sizeof(FOURCC); @@ -888,11 +888,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSi StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc); - if (FAILED(hr)) return hr; - - if (hr == S_FALSE) { - switch (Chunk.fccID) { + switch (Chunk.fccID) { case DMUS_FOURCC_SEGMENT_CHUNK: { DWORD checkSz = sizeof(FOURCC); TRACE_(dmfile)(": segment chunk\n"); @@ -938,34 +934,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSi case FOURCC_LIST: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - ListCount[0] = 0; switch (Chunk.fccID) { - case DMUS_FOURCC_UNFO_LIST: { - TRACE_(dmfile)(": UNFO list\n"); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - - hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc); - if (FAILED(hr)) return hr; - - if (hr == S_FALSE) { - switch (Chunk.fccID) { - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - } - - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - break; - } case DMUS_FOURCC_TRACK_LIST: { TRACE_(dmfile)(": TRACK list\n"); hr = parse_track_list(This, &Chunk, pStm); @@ -987,7 +956,6 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSi IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } - } } TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); -- 2.14.3

1 0

[PATCH 1/3] dmime: Reimplement IPersistStream_Load() for DMSegment
by Michael Stefaniuc 16 Mar '18

16 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/dmobject.h | 20 ++++++++++++ dlls/dmime/segment.c | 86 +++++++++++++++++---------------------------------- 2 files changed, 49 insertions(+), 57 deletions(-) diff --git a/dlls/dmime/dmobject.h b/dlls/dmime/dmobject.h index 2940225698..4a721cc152 100644 --- a/dlls/dmime/dmobject.h +++ b/dlls/dmime/dmobject.h @@ -40,6 +40,26 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str, ULONG size) DECLSPEC_HIDDEN; +static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk) +{ + LARGE_INTEGER offset; + + offset.QuadPart = chunk->offset.QuadPart + sizeof(FOURCC) + sizeof(DWORD); + if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST) + offset.QuadPart += sizeof(FOURCC); + + return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); +} + +static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chunk_entry *chunk) +{ + LARGE_INTEGER offset; + + offset.QuadPart = chunk->offset.QuadPart; + + return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); +} + const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index fcb97bef02..3122d2207a 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -873,20 +873,14 @@ static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSize, IStream *pStm) { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; + DWORD StreamCount, ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - if (pChunk->fccID != DMUS_FOURCC_SEGMENT_FORM) { - ERR_(dmfile)(": %s chunk should be a segment form\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - StreamSize = pChunk->dwSize - sizeof(FOURCC); + StreamSize -= sizeof(FOURCC); StreamCount = 0; do { @@ -1006,57 +1000,35 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface); } -static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface); - HRESULT hr; - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize; - /*DWORD ListSize[3], ListCount[3];*/ - LARGE_INTEGER liMove; /* used when skipping chunks */ + IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface); + struct chunk_entry riff = {0}; + HRESULT hr; - TRACE("(%p, %p): Loading\n", This, pStm); - hr = IStream_Read (pStm, &Chunk, sizeof(Chunk), NULL); - if(hr != S_OK){ - WARN("IStream_Read failed: %08x\n", hr); - return DMUS_E_UNSUPPORTED_STREAM; - } - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_RIFF: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); - StreamSize = Chunk.dwSize - sizeof(FOURCC); - switch (Chunk.fccID) { - case DMUS_FOURCC_SEGMENT_FORM: { - TRACE_(dmfile)(": segment form\n"); - hr = parse_segment_form(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - case mmioFOURCC('W','A','V','E'): { - FIXME(": WAVE form loading not implemented\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk (loading failed)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return DMUS_E_UNSUPPORTED_STREAM; - } + TRACE("(%p, %p): Loading\n", This, stream); + + if (!stream) + return E_POINTER; + + if (stream_get_chunk(stream, &riff) != S_OK || riff.id != FOURCC_RIFF) + return DMUS_E_UNSUPPORTED_STREAM; + + stream_reset_chunk_start(stream, &riff); + hr = IDirectMusicObject_ParseDescriptor(&This->dmobj.IDirectMusicObject_iface, stream, + &This->dmobj.desc); + if (FAILED(hr)) + return hr; + stream_reset_chunk_data(stream, &riff); + + if (riff.type == DMUS_FOURCC_SEGMENT_FORM) + hr = parse_segment_form(This, riff.size, stream); + else { + FIXME("WAVE form loading not implemented\n"); + hr = S_OK; } - TRACE_(dmfile)(": reading finished\n"); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - return DMUS_E_UNSUPPORTED_STREAM; - } - } - - return S_OK; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { -- 2.14.3

1 0

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

15 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(-)

1 0

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