wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Jacek Caban : oleaut32: Fix sharing options in TLB_ReadTypeLib.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 62ea59774bfb455737e14fd4ffdc70e2998c1dfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=62ea59774bfb455737e14fd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 6 15:48:30 2019 +0100 oleaut32: Fix sharing options in TLB_ReadTypeLib. Spotted by Donna Whisnant and Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e629ed51d5..eb713a4e2f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3329,7 +3329,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath if(file != pszFileName) heap_free(file); - h = CreateFileW(pszPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFileW(pszPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(h != INVALID_HANDLE_VALUE){ FILE_NAME_INFORMATION size_info; BOOL br;

1 0

Derek Lesho : bcrypt: Add more BCryptSignHash tests.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 741f8ae24ec33a122279b5efd006345e259151cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=741f8ae24ec33a122279b5ef… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Dec 6 15:42:50 2019 +0100 bcrypt: Add more BCryptSignHash tests. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d125e0c89d..198acbf721 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2049,6 +2049,9 @@ static void test_BCryptSignHash(void) { static UCHAR hash[] = {0x7e,0xe3,0x74,0xe7,0xc5,0x0b,0x6b,0x70,0xdb,0xab,0x32,0x6d,0x1d,0x51,0xd6,0x74,0x79,0x8e,0x5b,0x4b}; + static UCHAR hash_sha256[] = + {0x25,0x2f,0x10,0xc8,0x36,0x10,0xeb,0xca,0x1a,0x05,0x9c,0x0b,0xae,0x82,0x55,0xeb,0xa2,0xf9,0x5b,0xe4, + 0xd1,0xd7,0xbC,0xfA,0x89,0xd7,0x24,0x8a,0x82,0xd9,0xf1,0x11}; BCRYPT_PKCS1_PADDING_INFO pad; BCRYPT_ALG_HANDLE alg; BCRYPT_KEY_HANDLE key; @@ -2056,6 +2059,8 @@ static void test_BCryptSignHash(void) NTSTATUS ret; ULONG len; + /* RSA */ + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); if (ret) { @@ -2087,6 +2092,14 @@ static void test_BCryptSignHash(void) len = 0; memset(sig, 0, sizeof(sig)); + + /* inference of padding info on RSA not supported */ + ret = pBCryptSignHash(key, NULL, hash, sizeof(hash), sig, sizeof(sig), &len, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + ret = pBCryptSignHash(key, &pad, hash, sizeof(hash), sig, 0, &len, BCRYPT_PAD_PKCS1); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ret = pBCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); ok(!ret, "got %08x\n", ret); ok(len == 64, "got %u\n", len); @@ -2099,6 +2112,42 @@ static void test_BCryptSignHash(void) ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(!ret, "got %08x\n", ret); + + /* ECDSA */ + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); + if (ret) + { + win_skip("failed to open ECDSA provider: %08x\n", ret); + return; + } + + ret = pBCryptGenerateKeyPair(alg, &key, 256, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptFinalizeKeyPair(key, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + memset(sig, 0, sizeof(sig)); + len = 0; + + /* automatically detects padding info */ + ret = pBCryptSignHash(key, NULL, hash, sizeof(hash), sig, sizeof(sig), &len, 0); + ok (!ret, "got %08x\n", ret); + ok (len == 64, "got %u\n", len); + + ret = pBCryptVerifySignature(key, NULL, hash, sizeof(hash), sig, len, 0); + ok(!ret, "got %08x\n", ret); + + /* mismatch info (SHA-1 != SHA-256) */ + ret = pBCryptSignHash(key, &pad, hash_sha256, sizeof(hash_sha256), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); + ok (ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "got %08x\n", ret); } static void test_BCryptEnumAlgorithms(void)

1 0

Hans Leidekker : bcrypt: Handle SHA1 hash in key_asymmetric_verify.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 1703ac54fa5994b5e31bfc352c57d1287924d0cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1703ac54fa5994b5e31bfc35… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 6 15:42:49 2019 +0100 bcrypt: Handle SHA1 hash in key_asymmetric_verify. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 28a14e9b85..1c31b5625f 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1064,6 +1064,7 @@ NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULO /* only the hash size must match, not the actual hash function */ switch (hash_len) { + case 20: hash_alg = GNUTLS_DIG_SHA1; break; case 32: hash_alg = GNUTLS_DIG_SHA256; break; case 48: hash_alg = GNUTLS_DIG_SHA384; break;

1 0

Derek Lesho : bcrypt: Add support for signing hashes with ECDSA keys.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 741f76fc2c9203105ca7f87c0014bb5a9da4d936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=741f76fc2c9203105ca7f87c… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Dec 6 15:42:48 2019 +0100 bcrypt: Add support for signing hashes with ECDSA keys. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 147 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 130 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index a6a07fff19..28a14e9b85 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -92,6 +92,7 @@ MAKE_FUNCPTR(gnutls_cipher_decrypt2); MAKE_FUNCPTR(gnutls_cipher_deinit); MAKE_FUNCPTR(gnutls_cipher_encrypt2); MAKE_FUNCPTR(gnutls_cipher_init); +MAKE_FUNCPTR(gnutls_decode_rs_value); MAKE_FUNCPTR(gnutls_global_deinit); MAKE_FUNCPTR(gnutls_global_init); MAKE_FUNCPTR(gnutls_global_set_log_function); @@ -189,6 +190,7 @@ BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_cipher_deinit) LOAD_FUNCPTR(gnutls_cipher_encrypt2) LOAD_FUNCPTR(gnutls_cipher_init) + LOAD_FUNCPTR(gnutls_decode_rs_value) LOAD_FUNCPTR(gnutls_global_deinit) LOAD_FUNCPTR(gnutls_global_init) LOAD_FUNCPTR(gnutls_global_set_log_function) @@ -711,6 +713,7 @@ NTSTATUS key_asymmetric_generate( struct key *key ) break; case ALG_ID_ECDH_P256: + case ALG_ID_ECDSA_P256: pk_alg = GNUTLS_PK_ECC; /* compatible with ECDSA and ECDH */ bitlen = GNUTLS_CURVE_TO_BITS( GNUTLS_ECC_CURVE_SECP256R1 ); break; @@ -1029,6 +1032,17 @@ static NTSTATUS prepare_gnutls_signature( struct key *key, UCHAR *signature, ULO } } +static gnutls_digest_algorithm_t get_digest_from_id( const WCHAR *alg_id ) +{ + if (!strcmpW( alg_id, BCRYPT_SHA1_ALGORITHM )) return GNUTLS_DIG_SHA1; + if (!strcmpW( alg_id, BCRYPT_SHA256_ALGORITHM )) return GNUTLS_DIG_SHA256; + if (!strcmpW( alg_id, BCRYPT_SHA384_ALGORITHM )) return GNUTLS_DIG_SHA384; + if (!strcmpW( alg_id, BCRYPT_SHA512_ALGORITHM )) return GNUTLS_DIG_SHA512; + if (!strcmpW( alg_id, BCRYPT_MD2_ALGORITHM )) return GNUTLS_DIG_MD2; + if (!strcmpW( alg_id, BCRYPT_MD5_ALGORITHM )) return GNUTLS_DIG_MD5; + return -1; +} + NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, UCHAR *signature, ULONG signature_len, DWORD flags ) { @@ -1068,11 +1082,7 @@ NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULO if (!(flags & BCRYPT_PAD_PKCS1) || !info) return STATUS_INVALID_PARAMETER; if (!info->pszAlgId) return STATUS_INVALID_SIGNATURE; - if (!strcmpW( info->pszAlgId, BCRYPT_SHA1_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA1; - else if (!strcmpW( info->pszAlgId, BCRYPT_SHA256_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA256; - else if (!strcmpW( info->pszAlgId, BCRYPT_SHA384_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA384; - else if (!strcmpW( info->pszAlgId, BCRYPT_SHA512_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA512; - else + if ((hash_alg = get_digest_from_id(info->pszAlgId)) == -1) { FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) ); return STATUS_NOT_SUPPORTED; @@ -1107,26 +1117,130 @@ NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULO return (ret < 0) ? STATUS_INVALID_SIGNATURE : STATUS_SUCCESS; } +static unsigned int get_signature_length( enum alg_id id ) +{ + switch (id) + { + case ALG_ID_ECDSA_P256: return 64; + case ALG_ID_ECDSA_P384: return 96; + default: + FIXME( "unhandled algorithm %u\n", id ); + return 0; + } +} + +NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signature, UCHAR *output, + ULONG output_len, ULONG *ret_len ) +{ + switch (type) + { + case ALG_ID_RSA: + case ALG_ID_RSA_SIGN: + { + if (output_len < signature.size) return STATUS_BUFFER_TOO_SMALL; + memcpy( output, signature.data, signature.size ); + *ret_len = signature.size; + return STATUS_SUCCESS; + } + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + { + int err; + unsigned int pad_size, sig_len = get_signature_length( type ); + gnutls_datum_t r, s; /* format as r||s */ + + if ((err = pgnutls_decode_rs_value( &signature, &r, &s ))) + { + pgnutls_perror( err ); + return STATUS_INTERNAL_ERROR; + } + + if (output_len < sig_len) return STATUS_BUFFER_TOO_SMALL; + + /* remove prepended zero byte */ + if (r.size % 2) + { + r.size--; + r.data += 1; + } + if (s.size % 2) + { + s.size--; + s.data += 1; + } + + if (r.size != s.size || r.size + s.size > sig_len) + { + ERR( "we didn't get a correct signature\n" ); + return STATUS_INTERNAL_ERROR; + } + + pad_size = (sig_len / 2) - s.size; + memset( output, 0, sig_len ); + + memcpy( output + pad_size, r.data, r.size ); + memcpy( output + (sig_len / 2) + pad_size, s.data, s.size ); + + *ret_len = sig_len; + return STATUS_SUCCESS; + } + default: + return STATUS_INTERNAL_ERROR; + } +} + NTSTATUS key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { BCRYPT_PKCS1_PADDING_INFO *pad = padding; gnutls_datum_t hash, signature; + gnutls_digest_algorithm_t hash_alg; + NTSTATUS status; int ret; - if (key->alg_id != ALG_ID_RSA && key->alg_id != ALG_ID_RSA_SIGN) + if (key->alg_id == ALG_ID_ECDSA_P256 || key->alg_id == ALG_ID_ECDSA_P384) { - FIXME( "algorithm %u not supported\n", key->alg_id ); - return STATUS_NOT_IMPLEMENTED; + /* With ECDSA, we find the digest algorithm from the hash length, and verify it */ + switch (input_len) + { + case 20: hash_alg = GNUTLS_DIG_SHA1; break; + case 32: hash_alg = GNUTLS_DIG_SHA256; break; + case 48: hash_alg = GNUTLS_DIG_SHA384; break; + case 64: hash_alg = GNUTLS_DIG_SHA512; break; + + default: + FIXME( "hash size %u not yet supported\n", input_len ); + return STATUS_INVALID_PARAMETER; + } + + if (flags == BCRYPT_PAD_PKCS1 && pad && pad->pszAlgId && get_digest_from_id( pad->pszAlgId ) != hash_alg) + { + WARN( "incorrect hashing algorithm %s, expected %u\n", debugstr_w(pad->pszAlgId), hash_alg ); + return STATUS_INVALID_PARAMETER; + } } - if (flags != BCRYPT_PAD_PKCS1) + else if (flags == BCRYPT_PAD_PKCS1) { - FIXME( "flags %08x not implemented\n", flags ); - return STATUS_NOT_IMPLEMENTED; + if (!pad || !pad->pszAlgId) + { + WARN( "padding info not found\n" ); + return STATUS_INVALID_PARAMETER; + } + + if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == -1) + { + FIXME( "hash algorithm %s not recognized\n", debugstr_w(pad->pszAlgId) ); + return STATUS_NOT_SUPPORTED; + } + } + else if (!flags) + { + WARN( "invalid flags %08x\n", flags ); + return STATUS_INVALID_PARAMETER; } - if (!pad || !pad->pszAlgId || lstrcmpiW(pad->pszAlgId, BCRYPT_SHA1_ALGORITHM)) + else { - FIXME( "%s padding not implemented\n", debugstr_w(pad ? pad->pszAlgId : NULL) ); + FIXME( "flags %08x not implemented\n", flags ); return STATUS_NOT_IMPLEMENTED; } @@ -1143,17 +1257,16 @@ NTSTATUS key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULON signature.data = NULL; signature.size = 0; - if ((ret = pgnutls_privkey_sign_hash( key->u.a.handle, GNUTLS_DIG_SHA1, 0, &hash, &signature ))) + if ((ret = pgnutls_privkey_sign_hash( key->u.a.handle, hash_alg, 0, &hash, &signature ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - if (output_len >= signature.size) memcpy( output, signature.data, signature.size ); - *ret_len = signature.size; + status = format_gnutls_signature( key->alg_id, signature, output, output_len, ret_len ); free( signature.data ); - return STATUS_SUCCESS; + return status; } NTSTATUS key_destroy( struct key *key )

1 0

Hans Leidekker : msado15: Implement _Stream_put_Type and _Stream_get_Type.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 2bca8eac3ad568939f17ee9c6ccd7ece2623d3c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bca8eac3ad568939f17ee9c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 6 14:54:21 2019 +0100 msado15: Implement _Stream_put_Type and _Stream_get_Type. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msado15/stream.c | 20 ++++++++++---- dlls/msado15/tests/Makefile.in | 5 ++++ dlls/msado15/tests/msado15.c | 63 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 1035da0e88..5dc6347ee1 100755 --- a/configure +++ b/configure @@ -20585,6 +20585,7 @@ wine_fn_config_makefile dlls/msacm32.drv enable_msacm32_drv wine_fn_config_makefile dlls/msacm32 enable_msacm32 wine_fn_config_makefile dlls/msacm32/tests enable_tests wine_fn_config_makefile dlls/msado15 enable_msado15 +wine_fn_config_makefile dlls/msado15/tests enable_tests wine_fn_config_makefile dlls/msadp32.acm enable_msadp32_acm wine_fn_config_makefile dlls/msasn1 enable_msasn1 wine_fn_config_makefile dlls/mscat32 enable_mscat32 diff --git a/configure.ac b/configure.ac index 06ac9c6c71..b0ba094134 100644 --- a/configure.ac +++ b/configure.ac @@ -3439,6 +3439,7 @@ WINE_CONFIG_MAKEFILE(dlls/msacm32.drv) WINE_CONFIG_MAKEFILE(dlls/msacm32) WINE_CONFIG_MAKEFILE(dlls/msacm32/tests) WINE_CONFIG_MAKEFILE(dlls/msado15) +WINE_CONFIG_MAKEFILE(dlls/msado15/tests) WINE_CONFIG_MAKEFILE(dlls/msadp32.acm) WINE_CONFIG_MAKEFILE(dlls/msasn1) WINE_CONFIG_MAKEFILE(dlls/mscat32) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 48a485d599..8e88b9aa65 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -32,8 +32,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct stream { - _Stream Stream_iface; - LONG refs; + _Stream Stream_iface; + LONG refs; + StreamTypeEnum type; }; static inline struct stream *impl_from_Stream( _Stream *iface ) @@ -130,14 +131,20 @@ static HRESULT WINAPI stream_put_Position( _Stream *iface, LONG pos ) static HRESULT WINAPI stream_get_Type( _Stream *iface, StreamTypeEnum *type ) { - FIXME( "%p, %p\n", iface, type ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, type ); + + *type = stream->type; + return S_OK; } static HRESULT WINAPI stream_put_Type( _Stream *iface, StreamTypeEnum type ) { - FIXME( "%p, %u\n", iface, type ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %u\n", stream, type ); + + stream->type = type; + return S_OK; } static HRESULT WINAPI stream_get_LineSeparator( _Stream *iface, LineSeparatorEnum *sep ) @@ -305,6 +312,7 @@ HRESULT Stream_create( void **obj ) if (!(stream = heap_alloc_zero( sizeof(*stream) ))) return E_OUTOFMEMORY; stream->Stream_iface.lpVtbl = &stream_vtbl; stream->refs = 1; + stream->type = adTypeText; *obj = &stream->Stream_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/Makefile.in b/dlls/msado15/tests/Makefile.in new file mode 100644 index 0000000000..a97f3dd433 --- /dev/null +++ b/dlls/msado15/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msado15.dll +IMPORTS = oleaut32 ole32 + +C_SRCS = \ + msado15.c diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c new file mode 100644 index 0000000000..ed465e2072 --- /dev/null +++ b/dlls/msado15/tests/msado15.c @@ -0,0 +1,63 @@ +/* + * Copyright 2019 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#define COBJMACROS +#include <initguid.h> +#include <oledb.h> +#include <msado15_backcompat.h> +#include "wine/test.h" + +static void test_Stream(void) +{ + _Stream *stream; + StreamTypeEnum type; + LONG refs; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* check default type */ + type = 0; + hr = _Stream_get_Type( stream, &type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == adTypeText, "got %u\n", type ); + + hr = _Stream_put_Type( stream, adTypeBinary ); + ok( hr == S_OK, "got %08x\n", hr ); + + type = 0; + hr = _Stream_get_Type( stream, &type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == adTypeBinary, "got %u\n", type ); + + /* revert */ + hr = _Stream_put_Type( stream, adTypeText ); + ok( hr == S_OK, "got %08x\n", hr ); + + refs = _Stream_Release( stream ); + ok( !refs, "got %d\n", refs ); +} + +START_TEST(msado15) +{ + CoInitialize( NULL ); + test_Stream(); + CoUninitialize(); +}

1 0

Hans Leidekker : msado15: Add a stub _Stream implementation.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: e54fc1a2def141d9832d84162d705e881e85bf89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e54fc1a2def141d9832d8416… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 6 14:54:20 2019 +0100 msado15: Add a stub _Stream implementation. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/Makefile.in | 3 +- dlls/msado15/main.c | 5 + dlls/msado15/msado15_classes.idl | 8 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/stream.c | 312 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 328 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e54fc1a2def141d9832d…

1 0

Hans Leidekker : msado15: Add a stub _Recordset implementation.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: db08f0c3f6c4391ed3b6b0d7d4e606529e5ffd31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db08f0c3f6c4391ed3b6b0d7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 6 14:54:19 2019 +0100 msado15: Add a stub _Recordset implementation. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/Makefile.in | 3 +- dlls/msado15/main.c | 5 + dlls/msado15/msado15_classes.idl | 8 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/recordset.c | 686 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 702 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db08f0c3f6c4391ed3b6…

1 0

Hans Leidekker : msado15: Add a stub _Connection implementation.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 8333a1ae0a313c305e2d74c3c736f88a39a5d6c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8333a1ae0a313c305e2d74c3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 6 14:54:18 2019 +0100 msado15: Add a stub _Connection implementation. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/Makefile.in | 6 +- dlls/msado15/connection.c | 344 +++++++++++++++++++++++++++++++++++++++ dlls/msado15/main.c | 106 ++++++++++++ dlls/msado15/msado15.spec | 4 +- dlls/msado15/msado15_classes.idl | 27 +++ dlls/msado15/msado15_private.h | 24 +++ 6 files changed, 508 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8333a1ae0a313c305e2d…

1 0

Hans Leidekker : msado15: Add typelib.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 7353f6f1fe27e7e1db7e2a367ae19da40dad18be URL: https://source.winehq.org/git/wine.git/?a=commit;h=7353f6f1fe27e7e1db7e2a36… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 6 14:54:17 2019 +0100 msado15: Add typelib. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/msado15/Makefile.in | 8 + dlls/msado15/main.c | 55 ++ dlls/msado15/msado15.spec | 4 + dlls/msado15/msado15_tlb.idl | 21 + include/Makefile.in | 1 + include/msado15_backcompat.idl | 2104 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 2196 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7353f6f1fe27e7e1db7e…

1 0

Nikolay Sivov : oleaut32/typelib: Implement DeleteImplType().
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 8aaa218b4731c01856e631926daaee7eec0129d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aaa218b4731c01856e63192… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 6 12:45:48 2019 +0300 oleaut32/typelib: Implement DeleteImplType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 98 +++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 21 +++++++++- 2 files changed, 117 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 47faad7763..053011d4be 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -6446,6 +6446,103 @@ static void test_dep(void) { DeleteFileW(filenameW); } +static void test_DeleteImplType(void) +{ + static OLECHAR interface1W[] = L"interface1"; + HREFTYPE hreftype, hreftype2; + ICreateTypeInfo2 *createti2; + ICreateTypeInfo *createti; + ICreateTypeLib2 *createtl; + WCHAR filenameW[MAX_PATH]; + ITypeInfo *dispti, *ti; + ITypeLib *stdole, *tl; + TYPEATTR *typeattr; + HRESULT hr; + int flags; + + hr = LoadTypeLib(L"stdole2.tlb", &stdole); + ok(hr == S_OK, "Failed to load stdole2, hr %#x.\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IDispatch, &dispti); + ok(hr == S_OK, "Failed to get IDispatch typeinfo, hr %#x.\n", hr); + + GetTempFileNameW(L".", L"tlb", 0, filenameW); + + hr = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + hr = ICreateTypeInfo_QueryInterface(createti, &IID_ICreateTypeInfo2, (void **)&createti2); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + ICreateTypeInfo_Release(createti); + + hr = ICreateTypeInfo2_AddRefTypeInfo(createti2, dispti, &hreftype); + ok(hr == S_OK, "Failed to add referenced typeinfo, hr %#x.\n", hr); + + hr = ICreateTypeInfo2_QueryInterface(createti2, &IID_ITypeInfo, (void **)&ti); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(!(typeattr->wTypeFlags & TYPEFLAG_FDISPATCHABLE), "Unexpected type flags %#x.\n", typeattr->wTypeFlags); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ICreateTypeInfo2_AddImplType(createti2, 0, hreftype); + ok(hr == S_OK, "Failed to add impl type, hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(typeattr->wTypeFlags & TYPEFLAG_FDISPATCHABLE, "Unexpected type flags %#x.\n", typeattr->wTypeFlags); + ok(typeattr->cImplTypes == 1, "Unexpected cImplTypes value.\n"); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + /* Delete impltype, check flags. */ + hr = ICreateTypeInfo2_DeleteImplType(createti2, 0); + ok(hr == S_OK, "Failed to delete impl type, hr %#x.\n", hr); + + hr = ICreateTypeInfo2_DeleteImplType(createti2, 0); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(typeattr->wTypeFlags & TYPEFLAG_FDISPATCHABLE, "Unexpected type flags %#x.\n", typeattr->wTypeFlags); + ok(!typeattr->cImplTypes, "Unexpected cImplTypes value.\n"); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ITypeInfo_GetImplTypeFlags(ti, 0, &flags); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = ITypeInfo_GetRefTypeOfImplType(ti, 0, &hreftype2); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hr == S_OK, "Failed to save changes, hr %#x.\n", hr); + ICreateTypeLib2_Release(createtl); + ITypeInfo_Release(ti); + ICreateTypeInfo2_Release(createti2); + + /* Load and check typeinfo. */ + hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); + ok(hr == S_OK, "Failed to load typelib, hr %#x.\n", hr); + + hr = ITypeLib_GetTypeInfo(tl, 0, &ti); + ok(hr == S_OK, "Failed to get typeinfo, hr %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(typeattr->wTypeFlags & TYPEFLAG_FDISPATCHABLE, "Unexpected type flags %#x.\n", typeattr->wTypeFlags); + ok(!typeattr->cImplTypes, "Unexpected cImplTypes value.\n"); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + ITypeInfo_Release(ti); + + ITypeLib_Release(tl); + + ITypeLib_Release(stdole); + ITypeInfo_Release(dispti); + + DeleteFileW(filenameW); +} + START_TEST(typelib) { const char *filename; @@ -6486,4 +6583,5 @@ START_TEST(typelib) test_GetLibAttr(); test_stub(); test_dep(); + test_DeleteImplType(); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6d96cc5fbe..e629ed51d5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -11356,8 +11356,25 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteImplType(ICreateTypeInfo2 *iface, UINT index) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u - stub\n", This, index); - return E_NOTIMPL; + int i; + + TRACE("%p %u\n", This, index); + + if (index >= This->typeattr.cImplTypes) + return TYPE_E_ELEMENTNOTFOUND; + + TLB_FreeCustData(&This->impltypes[index].custdata_list); + --This->typeattr.cImplTypes; + + if (index < This->typeattr.cImplTypes) + { + memmove(This->impltypes + index, This->impltypes + index + 1, (This->typeattr.cImplTypes - index) * + sizeof(*This->impltypes)); + for (i = index; i < This->typeattr.cImplTypes; ++i) + TLB_relink_custdata(&This->impltypes[i].custdata_list); + } + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetCustData(ICreateTypeInfo2 *iface,

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
64
Older →

Jump to page:

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-commits December 2019