December 2019 - Wine-Devel - list.winehq.org

[PATCH] po: Update German translation.
by Julian Rüger Dec. 6, 2019

Dec. 6, 2019

Thanks Nikolay! Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] msvcrt: Support mixing length and width in scanf format.
by Piotr Caban Dec. 6, 2019

Dec. 6, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45967 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/scanf.h | 13 +++++++------ dlls/msvcrt/tests/scanf.c | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-)

1 0

[PATCH] oleaut32: Fix sharing options in TLB_ReadTypeLib.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

Spotted by Donna Whisnant and Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v4 3/3] bcrypt: Add more BCryptSignHash tests.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

From: Derek Lesho <dlesho(a)codeweavers.com> v2: Verify signature. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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) -- 2.20.1

1 0

[PATCH v4 2/3] bcrypt: Handle SHA1 hash in key_asymmetric_verify.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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; -- 2.20.1

1 0

[PATCH v4 1/3] bcrypt: Add support for signing hashes with ECDSA keys.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

From: Derek Lesho <dlesho(a)codeweavers.com> v3: Fix accidental return of 0 (STATUS_SUCCESS) when gnutls_decode_rs_value fails. v4: Print the error with gnutls_error. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 ) -- 2.20.1

1 0

[PATCH v2 5/5] msado15: Implement _Stream_put_Type and _Stream_get_Type.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- configure.ac | 1 + dlls/msado15/stream.c | 20 +++++++---- dlls/msado15/tests/Makefile.in | 5 +++ dlls/msado15/tests/msado15.c | 63 ++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 dlls/msado15/tests/Makefile.in create mode 100644 dlls/msado15/tests/msado15.c 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(); +} -- 2.20.1

2 1

[PATCH] dwrite: Remove unnecessary casts.
by Nikolay Sivov Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ef09f8e2bf..2670a22839 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1522,7 +1522,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace5 if (FAILED(hr = get_filestream_from_file(data->file, &desc.stream))) return hr; - desc.factory = (IDWriteFactory7 *)font->family->collection->factory; + desc.factory = font->family->collection->factory; desc.face_type = data->face_type; desc.files = &data->file; desc.files_number = 1; @@ -4055,7 +4055,7 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat WCHAR familyW[255]; UINT32 index; - desc.factory = (IDWriteFactory7 *)factory; + desc.factory = factory; desc.face_type = face_type; desc.files = &file; desc.stream = stream; @@ -4400,7 +4400,7 @@ static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrit struct fontface_desc desc; /* alloc and init new font data structure */ - desc.factory = (IDWriteFactory7 *)factory; + desc.factory = factory; desc.face_type = face_type; desc.index = i; desc.files = &file; -- 2.24.0

1 0

mferror clarification for translators
by Julian Rüger Dec. 6, 2019

Dec. 6, 2019

Hi Nikolay! Once again, I have a question regarding your mferror strings. #: mferror.mc:550 msgid "Media sink stream sinks set is fixed.\n" Is this (Media sink) (stream sinks set)? Or (Media sink stream) (sinks set)? What is that supposed to mean exactly? ;) Also "fixed" as in "cannot be changed", "repaired/corrected" or something else? Thanks, Julian PS: If anyone speaking German has ideas for less clumsy translations, I'm all ears... #: mferror.mc:564 msgid "Sample allocation was canceled.\n" msgstr "Allokation des Abtastwerts wurde abgebrochen.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" msgstr "Datenstromausgänge nicht mehr synchron.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" msgstr "Es wurden keine Abtastwerte durch den Ausgang verarbeitet.\n"

2 1

[PATCH 5/5] msado15: Implement _Stream_put_Type and _Stream_get_Type.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- configure.ac | 1 + dlls/msado15/stream.c | 20 +++++++---- dlls/msado15/tests/Makefile.in | 5 +++ dlls/msado15/tests/msado15.c | 63 ++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 dlls/msado15/tests/Makefile.in create mode 100644 dlls/msado15/tests/msado15.c 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(); +} -- 2.20.1

2 2

[PATCH v2 4/5] msado15: Add a stub _Stream implementation.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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(-) create mode 100644 dlls/msado15/stream.c diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 5b255df323..604f9ff018 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -6,7 +6,8 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ connection.c \ main.c \ - recordset.c + recordset.c \ + stream.c IDL_SRCS = \ msado15_classes.idl \ diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 321ba40e3b..32ae252337 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -119,6 +119,7 @@ static const struct IClassFactoryVtbl msadocf_vtbl = static struct msadocf connection_cf = { { &msadocf_vtbl }, Connection_create }; static struct msadocf recordset_cf = { { &msadocf_vtbl }, Recordset_create }; +static struct msadocf stream_cf = { { &msadocf_vtbl }, Stream_create }; /*********************************************************************** * DllGetClassObject @@ -137,6 +138,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) { cf = &recordset_cf.IClassFactory_iface; } + else if (IsEqualGUID( clsid, &CLSID_Stream )) + { + cf = &stream_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, obj ); } diff --git a/dlls/msado15/msado15_classes.idl b/dlls/msado15/msado15_classes.idl index 56e86a0dc6..5ede180240 100644 --- a/dlls/msado15/msado15_classes.idl +++ b/dlls/msado15/msado15_classes.idl @@ -33,3 +33,11 @@ coclass Connection { interface _Connection; } uuid(00000535-0000-0010-8000-00aa006d2ea4) ] coclass Recordset { interface _Recordset; } + +[ + threading(both), + progid("ADODB.Stream.6.0"), + vi_progid("ADODB.Stream"), + uuid(00000566-0000-0010-8000-00aa006d2ea4) +] +coclass Stream { interface _Stream; } diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 1f8948522b..83c8b7c966 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -21,5 +21,6 @@ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; +HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; #endif /* _WINE_MSADO15_PRIVATE_H_ */ diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c new file mode 100644 index 0000000000..48a485d599 --- /dev/null +++ b/dlls/msado15/stream.c @@ -0,0 +1,312 @@ +/* + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "msado15_backcompat.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado15); + +struct stream +{ + _Stream Stream_iface; + LONG refs; +}; + +static inline struct stream *impl_from_Stream( _Stream *iface ) +{ + return CONTAINING_RECORD( iface, struct stream, Stream_iface ); +} + +static ULONG WINAPI stream_AddRef( _Stream *iface ) +{ + struct stream *stream = impl_from_Stream( iface ); + return InterlockedIncrement( &stream->refs ); +} + +static ULONG WINAPI stream_Release( _Stream *iface ) +{ + struct stream *stream = impl_from_Stream( iface ); + LONG refs = InterlockedDecrement( &stream->refs ); + if (!refs) + { + TRACE( "destroying %p\n", stream ); + heap_free( stream ); + } + return refs; +} + +static HRESULT WINAPI stream_QueryInterface( _Stream *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID__Stream ) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + stream_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI stream_GetTypeInfoCount( _Stream *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_GetTypeInfo( _Stream *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_GetIDsOfNames( _Stream *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) +{ + FIXME( "%p, %p\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) +{ + FIXME( "%p, %p\n", iface, eos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) +{ + FIXME( "%p, %p\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_put_Position( _Stream *iface, LONG pos ) +{ + FIXME( "%p, %d\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_Type( _Stream *iface, StreamTypeEnum *type ) +{ + FIXME( "%p, %p\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_put_Type( _Stream *iface, StreamTypeEnum type ) +{ + FIXME( "%p, %u\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_LineSeparator( _Stream *iface, LineSeparatorEnum *sep ) +{ + FIXME( "%p, %p\n", iface, sep ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_put_LineSeparator( _Stream *iface, LineSeparatorEnum sep ) +{ + FIXME( "%p, %d\n", iface, sep ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_State( _Stream *iface, ObjectStateEnum *state ) +{ + FIXME( "%p, %p\n", iface, state ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_Mode( _Stream *iface, ConnectModeEnum *mode ) +{ + FIXME( "%p, %p\n", iface, mode ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_put_Mode( _Stream *iface, ConnectModeEnum mode ) +{ + FIXME( "%p, %u\n", iface, mode ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_Charset( _Stream *iface, BSTR *charset ) +{ + FIXME( "%p, %p\n", iface, charset ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_put_Charset( _Stream *iface, BSTR charset ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(charset) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Read( _Stream *iface, LONG size, VARIANT *val ) +{ + FIXME( "%p, %d, %p\n", iface, size, val ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Open( _Stream *iface, VARIANT src, ConnectModeEnum mode, StreamOpenOptionsEnum options, + BSTR username, BSTR password ) +{ + FIXME( "%p, %s, %u, %d, %s, %p\n", iface, debugstr_variant(&src), mode, options, debugstr_w(username), password ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Close( _Stream *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_SkipLine( _Stream *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Write( _Stream *iface, VARIANT buf ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&buf) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_SetEOS( _Stream *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, LONG size ) +{ + FIXME( "%p, %p, %d\n", iface, dst, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Flush( _Stream *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_SaveToFile( _Stream *iface, BSTR filename, SaveOptionsEnum options ) +{ + FIXME( "%p, %s, %u\n", iface, debugstr_w(filename), options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_LoadFromFile( _Stream *iface, BSTR filename ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(filename) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret ) +{ + FIXME( "%p, %d, %p\n", iface, len, ret ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_WriteText( _Stream *iface, BSTR data, StreamWriteEnum options ) +{ + FIXME( "%p, %p, %u\n", iface, debugstr_w(data), options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Cancel( _Stream *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static const struct _StreamVtbl stream_vtbl = +{ + stream_QueryInterface, + stream_AddRef, + stream_Release, + stream_GetTypeInfoCount, + stream_GetTypeInfo, + stream_GetIDsOfNames, + stream_Invoke, + stream_get_Size, + stream_get_EOS, + stream_get_Position, + stream_put_Position, + stream_get_Type, + stream_put_Type, + stream_get_LineSeparator, + stream_put_LineSeparator, + stream_get_State, + stream_get_Mode, + stream_put_Mode, + stream_get_Charset, + stream_put_Charset, + stream_Read, + stream_Open, + stream_Close, + stream_SkipLine, + stream_Write, + stream_SetEOS, + stream_CopyTo, + stream_Flush, + stream_SaveToFile, + stream_LoadFromFile, + stream_ReadText, + stream_WriteText, + stream_Cancel +}; + +HRESULT Stream_create( void **obj ) +{ + struct stream *stream; + + if (!(stream = heap_alloc_zero( sizeof(*stream) ))) return E_OUTOFMEMORY; + stream->Stream_iface.lpVtbl = &stream_vtbl; + stream->refs = 1; + + *obj = &stream->Stream_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} -- 2.20.1

1 0

[PATCH v2 3/5] msado15: Add a stub _Recordset implementation.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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(-) create mode 100644 dlls/msado15/recordset.c diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index b901944bc1..5b255df323 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -5,7 +5,8 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ connection.c \ - main.c + main.c \ + recordset.c IDL_SRCS = \ msado15_classes.idl \ diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index d292826b1f..321ba40e3b 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -118,6 +118,7 @@ static const struct IClassFactoryVtbl msadocf_vtbl = }; static struct msadocf connection_cf = { { &msadocf_vtbl }, Connection_create }; +static struct msadocf recordset_cf = { { &msadocf_vtbl }, Recordset_create }; /*********************************************************************** * DllGetClassObject @@ -132,6 +133,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) { cf = &connection_cf.IClassFactory_iface; } + else if (IsEqualGUID( clsid, &CLSID_Recordset )) + { + cf = &recordset_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, obj ); } diff --git a/dlls/msado15/msado15_classes.idl b/dlls/msado15/msado15_classes.idl index f69fea0a1a..56e86a0dc6 100644 --- a/dlls/msado15/msado15_classes.idl +++ b/dlls/msado15/msado15_classes.idl @@ -25,3 +25,11 @@ uuid(00000514-0000-0010-8000-00aa006d2ea4) ] coclass Connection { interface _Connection; } + +[ + threading(both), + progid("ADODB.Recordset.6.0"), + vi_progid("ADODB.Recordset"), + uuid(00000535-0000-0010-8000-00aa006d2ea4) +] +coclass Recordset { interface _Recordset; } diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 1d4c379443..1f8948522b 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -20,5 +20,6 @@ #define _WINE_MSADO15_PRIVATE_H_ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; +HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; #endif /* _WINE_MSADO15_PRIVATE_H_ */ diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c new file mode 100644 index 0000000000..bf0ca6e90f --- /dev/null +++ b/dlls/msado15/recordset.c @@ -0,0 +1,686 @@ +/* + * 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 <stdarg.h> +#include <assert.h> +#include "windef.h" +#include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "msado15_backcompat.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado15); + +struct recordset +{ + _Recordset Recordset_iface; + LONG refs; +}; + +static inline struct recordset *impl_from_Recordset( _Recordset *iface ) +{ + return CONTAINING_RECORD( iface, struct recordset, Recordset_iface ); +} + +static ULONG WINAPI recordset_AddRef( _Recordset *iface ) +{ + struct recordset *recordset = impl_from_Recordset( iface ); + LONG refs = InterlockedIncrement( &recordset->refs ); + TRACE( "%p new refcount %d\n", recordset, refs ); + return refs; +} + +static ULONG WINAPI recordset_Release( _Recordset *iface ) +{ + struct recordset *recordset = impl_from_Recordset( iface ); + LONG refs = InterlockedDecrement( &recordset->refs ); + TRACE( "%p new refcount %d\n", recordset, refs ); + if (!refs) + { + TRACE( "destroying %p\n", recordset ); + heap_free( recordset ); + } + return refs; +} + +static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID__Recordset ) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + recordset_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI recordset_GetTypeInfoCount( _Recordset *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_GetTypeInfo( _Recordset *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_GetIDsOfNames( _Recordset *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Invoke( _Recordset *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Properties( _Recordset *iface, Properties **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_AbsolutePosition( _Recordset *iface, PositionEnum_Param *pos ) +{ + FIXME( "%p, %p\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_AbsolutePosition( _Recordset *iface, PositionEnum_Param pos ) +{ + FIXME( "%p, %d\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_putref_ActiveConnection( _Recordset *iface, IDispatch *connection ) +{ + FIXME( "%p, %p\n", iface, connection ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_ActiveConnection( _Recordset *iface, VARIANT connection ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&connection) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_ActiveConnection( _Recordset *iface, VARIANT *connection ) +{ + FIXME( "%p, %p\n", iface, connection ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_BOF( _Recordset *iface, VARIANT_BOOL *bof ) +{ + FIXME( "%p, %p\n", iface, bof ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Bookmark( _Recordset *iface, VARIANT *bookmark ) +{ + FIXME( "%p, %p\n", iface, bookmark ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Bookmark( _Recordset *iface, VARIANT bookmark ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&bookmark) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_CacheSize( _Recordset *iface, LONG *size ) +{ + FIXME( "%p, %p\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_CacheSize( _Recordset *iface, LONG size ) +{ + FIXME( "%p, %d\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_CursorType( _Recordset *iface, CursorTypeEnum *cursor_type ) +{ + FIXME( "%p, %p\n", iface, cursor_type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_CursorType( _Recordset *iface, CursorTypeEnum cursor_type ) +{ + FIXME( "%p, %d\n", iface, cursor_type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_EOF( _Recordset *iface, VARIANT_BOOL *eof ) +{ + FIXME( "%p, %p\n", iface, eof ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Fields( _Recordset *iface, Fields **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_LockType( _Recordset *iface, LockTypeEnum *lock_type ) +{ + FIXME( "%p, %p\n", iface, lock_type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_LockType( _Recordset *iface, LockTypeEnum lock_type ) +{ + FIXME( "%p, %d\n", iface, lock_type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, LONG *max_records ) +{ + FIXME( "%p, %p\n", iface, max_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, LONG max_records ) +{ + FIXME( "%p, %d\n", iface, max_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, LONG *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_putref_Source( _Recordset *iface, IDispatch *source ) +{ + FIXME( "%p, %p\n", iface, source ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Source( _Recordset *iface, BSTR source ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(source) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Source( _Recordset *iface, VARIANT *source ) +{ + FIXME( "%p, %p\n", iface, source ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_AddNew( _Recordset *iface, VARIANT field_list, VARIANT values ) +{ + FIXME( "%p, %s, %s\n", iface, debugstr_variant(&field_list), debugstr_variant(&values) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_CancelUpdate( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Close( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Delete( _Recordset *iface, AffectEnum affect_records ) +{ + FIXME( "%p, %u\n", iface, affect_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_GetRows( _Recordset *iface, LONG rows, VARIANT start, VARIANT fields, VARIANT *var ) +{ + FIXME( "%p, %d, %s, %s, %p\n", iface, rows, debugstr_variant(&start), debugstr_variant(&fields), var ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Move( _Recordset *iface, LONG num_records, VARIANT start ) +{ + FIXME( "%p, %d, %s\n", iface, num_records, debugstr_variant(&start) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_MoveNext( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_MovePrevious( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_MoveFirst( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_MoveLast( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT active_connection, + CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) +{ + FIXME( "%p, %s, %s, %d, %d, %d\n", iface, debugstr_variant(&source), debugstr_variant(&active_connection), + cursor_type, lock_type, options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Requery( _Recordset *iface, LONG options ) +{ + FIXME( "%p, %d\n", iface, options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset__xResync( _Recordset *iface, AffectEnum affect_records ) +{ + FIXME( "%p, %u\n", iface, affect_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Update( _Recordset *iface, VARIANT fields, VARIANT values ) +{ + FIXME( "%p, %s, %s\n", iface, debugstr_variant(&fields), debugstr_variant(&values) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_AbsolutePage( _Recordset *iface, PositionEnum_Param *pos ) +{ + FIXME( "%p, %p\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_AbsolutePage( _Recordset *iface, PositionEnum_Param pos ) +{ + FIXME( "%p, %d\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_EditMode( _Recordset *iface, EditModeEnum *mode ) +{ + FIXME( "%p, %p\n", iface, mode ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Filter( _Recordset *iface, VARIANT *criteria ) +{ + FIXME( "%p, %p\n", iface, criteria ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Filter( _Recordset *iface, VARIANT criteria ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&criteria) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_PageCount( _Recordset *iface, LONG *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_PageSize( _Recordset *iface, LONG *size ) +{ + FIXME( "%p, %p\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_PageSize( _Recordset *iface, LONG size ) +{ + FIXME( "%p, %d\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Sort( _Recordset *iface, BSTR *criteria ) +{ + FIXME( "%p, %p\n", iface, criteria ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Sort( _Recordset *iface, BSTR criteria ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(criteria) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Status( _Recordset *iface, LONG *status ) +{ + FIXME( "%p, %p\n", iface, status ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_State( _Recordset *iface, LONG *state ) +{ + FIXME( "%p, %p\n", iface, state ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset__xClone( _Recordset *iface, _Recordset **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_UpdateBatch( _Recordset *iface, AffectEnum affect_records ) +{ + FIXME( "%p, %u\n", iface, affect_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_CancelBatch( _Recordset *iface, AffectEnum affect_records ) +{ + FIXME( "%p, %u\n", iface, affect_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_CursorLocation( _Recordset *iface, CursorLocationEnum *cursor_loc ) +{ + FIXME( "%p, %p\n", iface, cursor_loc ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLocationEnum cursor_loc ) +{ + FIXME( "%p, %u\n", iface, cursor_loc ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_NextRecordset( _Recordset *iface, VARIANT *records_affected, _Recordset **record_set ) +{ + FIXME( "%p, %p, %p\n", iface, records_affected, record_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Supports( _Recordset *iface, CursorOptionEnum cursor_options, VARIANT_BOOL *ret ) +{ + FIXME( "%p, %08x, %p\n", iface, cursor_options, ret ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Collect( _Recordset *iface, VARIANT index, VARIANT *var ) +{ + FIXME( "%p, %s, %p\n", iface, debugstr_variant(&index), var ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Collect( _Recordset *iface, VARIANT index, VARIANT var ) +{ + FIXME( "%p, %s, %s\n", iface, debugstr_variant(&index), debugstr_variant(&var) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_MarshalOptions( _Recordset *iface, MarshalOptionsEnum *options ) +{ + FIXME( "%p, %p\n", iface, options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_MarshalOptions( _Recordset *iface, MarshalOptionsEnum options ) +{ + FIXME( "%p, %u\n", iface, options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Find( _Recordset *iface, BSTR criteria, LONG skip_records, + SearchDirectionEnum search_direction, VARIANT start ) +{ + FIXME( "%p, %s, %d, %d, %s\n", iface, debugstr_w(criteria), skip_records, search_direction, + debugstr_variant(&start) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Cancel( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_DataSource( _Recordset *iface, IUnknown **data_source ) +{ + FIXME( "%p, %p\n", iface, data_source ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_putref_DataSource( _Recordset *iface, IUnknown *data_source ) +{ + FIXME( "%p, %p\n", iface, data_source ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset__xSave( _Recordset *iface, BSTR filename, PersistFormatEnum persist_format ) +{ + FIXME( "%p, %s, %u\n", iface, debugstr_w(filename), persist_format ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_ActiveCommand( _Recordset *iface, IDispatch **cmd ) +{ + FIXME( "%p, %p\n", iface, cmd ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_StayInSync( _Recordset *iface, VARIANT_BOOL stay_in_sync ) +{ + FIXME( "%p, %d\n", iface, stay_in_sync ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_StayInSync( _Recordset *iface, VARIANT_BOOL *stay_in_sync ) +{ + FIXME( "%p, %p\n", iface, stay_in_sync ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_GetString( _Recordset *iface, StringFormatEnum string_format, LONG num_rows, + BSTR column_delimeter, BSTR row_delimeter, BSTR null_expr, + BSTR *ret_string ) +{ + FIXME( "%p, %u, %d, %s, %s, %s, %p\n", iface, string_format, num_rows, debugstr_w(column_delimeter), + debugstr_w(row_delimeter), debugstr_w(null_expr), ret_string ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_DataMember( _Recordset *iface, BSTR *data_member ) +{ + FIXME( "%p, %p\n", iface, data_member ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_DataMember( _Recordset *iface, BSTR data_member ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(data_member) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_CompareBookmarks( _Recordset *iface, VARIANT bookmark1, VARIANT bookmark2, CompareEnum *compare ) +{ + FIXME( "%p, %s, %s, %p\n", iface, debugstr_variant(&bookmark1), debugstr_variant(&bookmark2), compare ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Clone( _Recordset *iface, LockTypeEnum lock_type, _Recordset **obj ) +{ + FIXME( "%p, %d, %p\n", iface, lock_type, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Resync( _Recordset *iface, AffectEnum affect_records, ResyncEnum resync_values ) +{ + FIXME( "%p, %u, %u\n", iface, affect_records, resync_values ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Seek( _Recordset *iface, VARIANT key_values, SeekEnum seek_option ) +{ + FIXME( "%p, %s, %u\n", iface, debugstr_variant(&key_values), seek_option ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Index( _Recordset *iface, BSTR index ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(index) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Index( _Recordset *iface, BSTR *index ) +{ + FIXME( "%p, %p\n", iface, index ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Save( _Recordset *iface, VARIANT destination, PersistFormatEnum persist_format ) +{ + FIXME( "%p, %s, %u\n", iface, debugstr_variant(&destination), persist_format ); + return E_NOTIMPL; +} + +static const struct _RecordsetVtbl recordset_vtbl = +{ + recordset_QueryInterface, + recordset_AddRef, + recordset_Release, + recordset_GetTypeInfoCount, + recordset_GetTypeInfo, + recordset_GetIDsOfNames, + recordset_Invoke, + recordset_get_Properties, + recordset_get_AbsolutePosition, + recordset_put_AbsolutePosition, + recordset_putref_ActiveConnection, + recordset_put_ActiveConnection, + recordset_get_ActiveConnection, + recordset_get_BOF, + recordset_get_Bookmark, + recordset_put_Bookmark, + recordset_get_CacheSize, + recordset_put_CacheSize, + recordset_get_CursorType, + recordset_put_CursorType, + recordset_get_EOF, + recordset_get_Fields, + recordset_get_LockType, + recordset_put_LockType, + recordset_get_MaxRecords, + recordset_put_MaxRecords, + recordset_get_RecordCount, + recordset_putref_Source, + recordset_put_Source, + recordset_get_Source, + recordset_AddNew, + recordset_CancelUpdate, + recordset_Close, + recordset_Delete, + recordset_GetRows, + recordset_Move, + recordset_MoveNext, + recordset_MovePrevious, + recordset_MoveFirst, + recordset_MoveLast, + recordset_Open, + recordset_Requery, + recordset__xResync, + recordset_Update, + recordset_get_AbsolutePage, + recordset_put_AbsolutePage, + recordset_get_EditMode, + recordset_get_Filter, + recordset_put_Filter, + recordset_get_PageCount, + recordset_get_PageSize, + recordset_put_PageSize, + recordset_get_Sort, + recordset_put_Sort, + recordset_get_Status, + recordset_get_State, + recordset__xClone, + recordset_UpdateBatch, + recordset_CancelBatch, + recordset_get_CursorLocation, + recordset_put_CursorLocation, + recordset_NextRecordset, + recordset_Supports, + recordset_get_Collect, + recordset_put_Collect, + recordset_get_MarshalOptions, + recordset_put_MarshalOptions, + recordset_Find, + recordset_Cancel, + recordset_get_DataSource, + recordset_putref_DataSource, + recordset__xSave, + recordset_get_ActiveCommand, + recordset_put_StayInSync, + recordset_get_StayInSync, + recordset_GetString, + recordset_get_DataMember, + recordset_put_DataMember, + recordset_CompareBookmarks, + recordset_Clone, + recordset_Resync, + recordset_Seek, + recordset_put_Index, + recordset_get_Index, + recordset_Save +}; + +HRESULT Recordset_create( void **obj ) +{ + struct recordset *recordset; + + if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; + recordset->Recordset_iface.lpVtbl = &recordset_vtbl; + recordset->refs = 1; + + *obj = &recordset->Recordset_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} -- 2.20.1

1 0

[PATCH v2 2/5] msado15: Add a stub _Connection implementation.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/Makefile.in | 8 +- 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, 509 insertions(+), 4 deletions(-) create mode 100644 dlls/msado15/connection.c create mode 100644 dlls/msado15/msado15_classes.idl create mode 100644 dlls/msado15/msado15_private.h diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 779a18df14..b901944bc1 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -1,8 +1,12 @@ MODULE = msado15.dll +IMPORTS = oleaut32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - main.c \ + connection.c \ + main.c -IDL_SRCS = msado15_tlb.idl +IDL_SRCS = \ + msado15_classes.idl \ + msado15_tlb.idl diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c new file mode 100644 index 0000000000..f33bc89a1a --- /dev/null +++ b/dlls/msado15/connection.c @@ -0,0 +1,344 @@ +/* + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "msado15_backcompat.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado15); + +struct connection +{ + _Connection Connection_iface; + LONG refs; +}; + +static inline struct connection *impl_from_Connection( _Connection *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, Connection_iface ); +} + +static ULONG WINAPI connection_AddRef( _Connection *iface ) +{ + struct connection *connection = impl_from_Connection( iface ); + return InterlockedIncrement( &connection->refs ); +} + +static ULONG WINAPI connection_Release( _Connection *iface ) +{ + struct connection *connection = impl_from_Connection( iface ); + LONG refs = InterlockedDecrement( &connection->refs ); + if (!refs) + { + TRACE( "destroying %p\n", connection ); + heap_free( connection ); + } + return refs; +} + +static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + connection_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI connection_GetTypeInfoCount( _Connection *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetTypeInfo( _Connection *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetIDsOfNames( _Connection *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Invoke( _Connection *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) +{ + FIXME( "%p, %p\n", iface, str ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(str) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) +{ + FIXME( "%p, %p\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_CommandTimeout( _Connection *iface, LONG timeout ) +{ + FIXME( "%p, %d\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_ConnectionTimeout( _Connection *iface, LONG *timeout ) +{ + FIXME( "%p, %p\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_ConnectionTimeout( _Connection *iface, LONG timeout ) +{ + FIXME( "%p, %d\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Version( _Connection *iface, BSTR *str ) +{ + FIXME( "%p, %p\n", iface, str ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Close( _Connection *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, + LONG options, _Recordset **record_set ) +{ + FIXME( "%p, %s, %p, %08x, %p\n", iface, debugstr_w(command), records_affected, options, record_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_BeginTrans( _Connection *iface, LONG *transaction_level ) +{ + FIXME( "%p, %p\n", iface, transaction_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_CommitTrans( _Connection *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_RollbackTrans( _Connection *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BSTR userid, BSTR password, + LONG options ) +{ + FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), + debugstr_w(password), options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Errors( _Connection *iface, Errors **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_DefaultDatabase( _Connection *iface, BSTR *str ) +{ + FIXME( "%p, %p\n", iface, str ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_DefaultDatabase( _Connection *iface, BSTR str ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(str) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_IsolationLevel( _Connection *iface, IsolationLevelEnum *level ) +{ + FIXME( "%p, %p\n", iface, level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_IsolationLevel( _Connection *iface, IsolationLevelEnum level ) +{ + FIXME( "%p, %d\n", iface, level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Attributes( _Connection *iface, LONG *attr ) +{ + FIXME( "%p, %p\n", iface, attr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_Attributes( _Connection *iface, LONG attr ) +{ + FIXME( "%p, %d\n", iface, attr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_CursorLocation( _Connection *iface, CursorLocationEnum *cursor_loc ) +{ + FIXME( "%p, %p\n", iface, cursor_loc ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_CursorLocation( _Connection *iface, CursorLocationEnum cursor_loc ) +{ + FIXME( "%p, %u\n", iface, cursor_loc ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Mode( _Connection *iface, ConnectModeEnum *mode ) +{ + FIXME( "%p, %p\n", iface, mode ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_Mode( _Connection *iface, ConnectModeEnum mode ) +{ + FIXME( "%p, %u\n", iface, mode ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Provider( _Connection *iface, BSTR *str ) +{ + FIXME( "%p, %p\n", iface, str ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_Provider( _Connection *iface, BSTR str ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(str) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_State( _Connection *iface, LONG *state ) +{ + FIXME( "%p, %p\n", iface, state ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_OpenSchema( _Connection *iface, SchemaEnum schema, VARIANT restrictions, + VARIANT schema_id, _Recordset **record_set ) +{ + FIXME( "%p, %d, %s, %s, %p\n", iface, schema, debugstr_variant(&restrictions), + debugstr_variant(&schema_id), record_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Cancel( _Connection *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static const struct _ConnectionVtbl connection_vtbl = +{ + connection_QueryInterface, + connection_AddRef, + connection_Release, + connection_GetTypeInfoCount, + connection_GetTypeInfo, + connection_GetIDsOfNames, + connection_Invoke, + connection_get_Properties, + connection_get_ConnectionString, + connection_put_ConnectionString, + connection_get_CommandTimeout, + connection_put_CommandTimeout, + connection_get_ConnectionTimeout, + connection_put_ConnectionTimeout, + connection_get_Version, + connection_Close, + connection_Execute, + connection_BeginTrans, + connection_CommitTrans, + connection_RollbackTrans, + connection_Open, + connection_get_Errors, + connection_get_DefaultDatabase, + connection_put_DefaultDatabase, + connection_get_IsolationLevel, + connection_put_IsolationLevel, + connection_get_Attributes, + connection_put_Attributes, + connection_get_CursorLocation, + connection_put_CursorLocation, + connection_get_Mode, + connection_put_Mode, + connection_get_Provider, + connection_put_Provider, + connection_get_State, + connection_OpenSchema, + connection_Cancel +}; + +HRESULT Connection_create( void **obj ) +{ + struct connection *connection; + + if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; + connection->Connection_iface.lpVtbl = &connection_vtbl; + connection->refs = 1; + + *obj = &connection->Connection_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 0c5b2615d0..d292826b1f 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -19,10 +19,18 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "initguid.h" +#define COBJMACROS #include "objbase.h" #include "rpcproxy.h" +#include "msado15_backcompat.h" #include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado15); static HINSTANCE hinstance; @@ -38,6 +46,104 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) return TRUE; } +typedef HRESULT (*fnCreateInstance)( void **obj ); + +struct msadocf +{ + IClassFactory IClassFactory_iface; + fnCreateInstance pfnCreateInstance; +}; + +static inline struct msadocf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct msadocf, IClassFactory_iface ); +} + +static HRESULT WINAPI msadocf_QueryInterface( IClassFactory *iface, REFIID riid, void **obj ) +{ + if (IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IClassFactory )) + { + IClassFactory_AddRef( iface ); + *obj = iface; + return S_OK; + } + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; +} + +static ULONG WINAPI msadocf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI msadocf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI msadocf_CreateInstance( IClassFactory *iface, LPUNKNOWN outer, REFIID riid, void **obj ) +{ + struct msadocf *cf = impl_from_IClassFactory( iface ); + IUnknown *unknown; + HRESULT hr; + + TRACE( "%p, %s, %p\n", outer, debugstr_guid(riid), obj ); + + *obj = NULL; + if (outer) + return CLASS_E_NOAGGREGATION; + + hr = cf->pfnCreateInstance( (void **)&unknown ); + if (FAILED(hr)) + return hr; + + hr = IUnknown_QueryInterface( unknown, riid, obj ); + IUnknown_Release( unknown ); + return hr; +} + +static HRESULT WINAPI msadocf_LockServer( IClassFactory *iface, BOOL dolock ) +{ + FIXME( "%p, %d\n", iface, dolock ); + return S_OK; +} + +static const struct IClassFactoryVtbl msadocf_vtbl = +{ + msadocf_QueryInterface, + msadocf_AddRef, + msadocf_Release, + msadocf_CreateInstance, + msadocf_LockServer +}; + +static struct msadocf connection_cf = { { &msadocf_vtbl }, Connection_create }; + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) +{ + IClassFactory *cf = NULL; + + TRACE( "%s, %s, %p\n", debugstr_guid(clsid), debugstr_guid(iid), obj ); + + if (IsEqualGUID( clsid, &CLSID_Connection )) + { + cf = &connection_cf.IClassFactory_iface; + } + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, obj ); +} + +/****************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + /*********************************************************************** * DllRegisterServer */ diff --git a/dlls/msado15/msado15.spec b/dlls/msado15/msado15.spec index 6d0e061a53..b16365d0c9 100644 --- a/dlls/msado15/msado15.spec +++ b/dlls/msado15/msado15.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/msado15/msado15_classes.idl b/dlls/msado15/msado15_classes.idl new file mode 100644 index 0000000000..f69fea0a1a --- /dev/null +++ b/dlls/msado15/msado15_classes.idl @@ -0,0 +1,27 @@ +/* + * 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 + */ + +#pragma makedep register + +[ + threading(apartment), + progid("ADODB.Connection.6.0"), + vi_progid("ADODB.Connection"), + uuid(00000514-0000-0010-8000-00aa006d2ea4) +] +coclass Connection { interface _Connection; } diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h new file mode 100644 index 0000000000..1d4c379443 --- /dev/null +++ b/dlls/msado15/msado15_private.h @@ -0,0 +1,24 @@ +/* + * 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 + */ + +#ifndef _WINE_MSADO15_PRIVATE_H_ +#define _WINE_MSADO15_PRIVATE_H_ + +HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; + +#endif /* _WINE_MSADO15_PRIVATE_H_ */ -- 2.20.1

1 0

[PATCH v2 1/5] msado15: Add typelib.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

v2: Drop explicit calling convention. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 ++++++++++++++++++++++++++++++++ 7 files changed, 2194 insertions(+) create mode 100644 dlls/msado15/Makefile.in create mode 100644 dlls/msado15/main.c create mode 100644 dlls/msado15/msado15.spec create mode 100644 dlls/msado15/msado15_tlb.idl create mode 100644 include/msado15_backcompat.idl diff --git a/configure.ac b/configure.ac index 7f2c3cda23..06ac9c6c71 100644 --- a/configure.ac +++ b/configure.ac @@ -3438,6 +3438,7 @@ WINE_CONFIG_MAKEFILE(dlls/msacm.dll16,enable_win16) 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/msadp32.acm) WINE_CONFIG_MAKEFILE(dlls/msasn1) WINE_CONFIG_MAKEFILE(dlls/mscat32) diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in new file mode 100644 index 0000000000..779a18df14 --- /dev/null +++ b/dlls/msado15/Makefile.in @@ -0,0 +1,8 @@ +MODULE = msado15.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c \ + +IDL_SRCS = msado15_tlb.idl diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c new file mode 100644 index 0000000000..0c5b2615d0 --- /dev/null +++ b/dlls/msado15/main.c @@ -0,0 +1,55 @@ +/* + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +static HINSTANCE hinstance; + +BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + hinstance = dll; + DisableThreadLibraryCalls( dll ); + break; + } + return TRUE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer( void ) +{ + return __wine_register_resources( hinstance ); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer( void ) +{ + return __wine_unregister_resources( hinstance ); +} diff --git a/dlls/msado15/msado15.spec b/dlls/msado15/msado15.spec new file mode 100644 index 0000000000..6d0e061a53 --- /dev/null +++ b/dlls/msado15/msado15.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/msado15/msado15_tlb.idl b/dlls/msado15/msado15_tlb.idl new file mode 100644 index 0000000000..f3a77df3ac --- /dev/null +++ b/dlls/msado15/msado15_tlb.idl @@ -0,0 +1,21 @@ +/* + * 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 + */ + +#pragma makedep regtypelib + +#include "msado15_backcompat.idl" diff --git a/include/Makefile.in b/include/Makefile.in index 421e3d6c59..2e9a921df7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -394,6 +394,7 @@ SOURCES = \ msacm.h \ msacmdlg.h \ msacmdrv.h \ + msado15_backcompat.idl \ msasn1.h \ mscat.h \ mscoree.idl \ diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl new file mode 100644 index 0000000000..a1d5e28038 --- /dev/null +++ b/include/msado15_backcompat.idl @@ -0,0 +1,2104 @@ +/* + * 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 + */ + +import "oaidl.idl"; + +interface _ADO; +interface _Collection; +interface _Command; +interface _Connection; +interface _DynaCollection; +interface _Parameter; +interface _Record; +interface _Recordset; +interface _Stream; +interface ADODebugging; +interface ADOConnectionConstruction; +interface ADOCommandConstruction; +interface ADORecordsetConstruction; +interface Command15; +interface Command25; +interface Error; +interface Errors; +interface Field; +interface Field15; +interface Field20; +interface Fields; +interface Fields15; +interface Fields20; +interface Parameters; +interface Properties; +interface Property; +interface Recordset15; +interface Recordset20; +interface Recordset21; +dispinterface ConnectionEvents; +dispinterface RecordsetEvents; + +typedef [uuid(0000052A-0000-0010-8000-00AA006D2EA4)] enum ErrorValueEnum +{ + adErrInvalidArgument = 3001, + adErrOpeningFile = 3002, + adErrReadFile = 3003, + adErrWriteFile = 3004, + adErrNoCurrentRecord = 3021, + adErrIllegalOperation = 3219, + adErrCantChangeProvider = 3220, + adErrInTransaction = 3246, + adErrFeatureNotAvailable = 3251, + adErrItemNotFound = 3265, + adErrObjectInCollection = 3367, + adErrObjectNotSet = 3420, + adErrDataConversion = 3421, + adErrObjectClosed = 3704, + adErrObjectOpen = 3705, + adErrProviderNotFound = 3706, + adErrBoundToCommand = 3707, + adErrInvalidParamInfo = 3708, + adErrInvalidConnection = 3709, + adErrNotReentrant = 3710, + adErrStillExecuting = 3711, + adErrOperationCancelled = 3712, + adErrStillConnecting = 3713, + adErrInvalidTransaction = 3714, + adErrNotExecuting = 3715, + adErrUnsafeOperation = 3716, + adWrnSecurityDialog = 3717, + adWrnSecurityDialogHeader = 3718, + adErrIntegrityViolation = 3719, + adErrPermissionDenied = 3720, + adErrDataOverflow = 3721, + adErrSchemaViolation = 3722, + adErrSignMismatch = 3723, + adErrCantConvertvalue = 3724, + adErrCantCreate = 3725, + adErrColumnNotOnThisRow = 3726, + adErrURLDoesNotExist = 3727, + adErrTreePermissionDenied = 3728, + adErrInvalidURL = 3729, + adErrResourceLocked = 3730, + adErrResourceExists = 3731, + adErrCannotComplete = 3732, + adErrVolumeNotFound = 3733, + adErrOutOfSpace = 3734, + adErrResourceOutOfScope = 3735, + adErrUnavailable = 3736, + adErrURLNamedRowDoesNotExist = 3737, + adErrDelResOutOfScope = 3738, + adErrPropInvalidColumn = 3739, + adErrPropInvalidOption = 3740, + adErrPropInvalidValue = 3741, + adErrPropConflicting = 3742, + adErrPropNotAllSettable = 3743, + adErrPropNotSet = 3744, + adErrPropNotSettable = 3745, + adErrPropNotSupported = 3746, + adErrCatalogNotSet = 3747, + adErrCantChangeConnection = 3748, + adErrFieldsUpdateFailed = 3749, + adErrDenyNotSupported = 3750, + adErrDenyTypeNotSupported = 3751, + adErrProviderNotSpecified = 3753, + adErrConnectionStringTooLong = 3754 +} ErrorValueEnum; + +typedef [uuid(00000528-0000-0010-8000-00aa006d2ea4)] enum PositionEnum +{ + adPosUnknown = -1, + adPosBOF = -2, + adPosEOF = -3 +} PositionEnum; + +typedef [uuid(a56187c5-d690-4037-ae32-a00edc376ac3), public] PositionEnum PositionEnum_Param; + +typedef [uuid(0000051f-0000-0010-8000-00aa006d2ea4)] enum DataTypeEnum +{ + adEmpty = 0, + adTinyInt = 16, + adSmallInt = 2, + adInteger = 3, + adBigInt = 20, + adUnsignedTinyInt = 17, + adUnsignedSmallInt = 18, + adUnsignedInt = 19, + adUnsignedBigInt = 21, + adSingle = 4, + adDouble = 5, + adCurrency = 6, + adDecimal = 14, + adNumeric = 131, + adBoolean = 11, + adError = 10, + adUserDefined = 132, + adVariant = 12, + adIDispatch = 9, + adIUnknown = 13, + adGUID = 72, + adDate = 7, + adDBDate = 133, + adDBTime = 134, + adDBTimeStamp = 135, + adBSTR = 8, + adChar = 129, + adVarChar = 200, + adLongVarChar = 201, + adWChar = 130, + adVarWChar = 202, + adLongVarWChar = 203, + adBinary = 128, + adVarBinary = 204, + adLongVarBinary = 205, + adChapter = 136, + adFileTime = 64, + adPropVariant = 138, + adVarNumeric = 139, + adArray = 0x2000 +} DataTypeEnum; + +typedef [uuid(00000548-0000-0010-8000-00aa006d2ea4)] enum PersistFormatEnum +{ + adPersistADTG = 0, + adPersistXML = 1 +} PersistFormatEnum; + +typedef [uuid(00000552-0000-0010-8000-00aa006d2ea4)] enum SeekEnum +{ + adSeekFirstEQ = 1, + adSeekLastEQ = 2, + adSeekAfterEQ = 4, + adSeekAfter = 8, + adSeekBeforeEQ = 16, + adSeekBefore = 32 +} SeekEnum; + +typedef [uuid(0000051b-0000-0010-8000-00aa006d2ea4)] enum CursorTypeEnum +{ + adOpenUnspecified = -1, + adOpenForwardOnly = 0, + adOpenKeyset = 1, + adOpenDynamic = 2, + adOpenStatic = 3 +} CursorTypeEnum; + +typedef [uuid(00000525-0000-0010-8000-00aa006d2ea4)] enum FieldAttributeEnum +{ + adFldUnspecified = -1, + adFldMayDefer = 0x00000002, + adFldUpdatable = 0x00000004, + adFldUnknownUpdatable = 0x00000008, + adFldFixed = 0x00000010, + adFldIsNullable = 0x00000020, + adFldMayBeNull = 0x00000040, + adFldLong = 0x00000080, + adFldRowID = 0x00000100, + adFldRowVersion = 0x00000200, + adFldCacheDeferred = 0x00001000, + adFldIsChapter = 0x00002000, + adFldNegativeScale = 0x00004000, + adFldKeyColumn = 0x00008000, + adFldIsRowURL = 0x00010000, + adFldIsDefaultStream = 0x00020000, + adFldIsCollection = 0x00040000 +} FieldAttributeEnum; + +typedef [uuid(00000544-0000-0010-8000-00aa006d2ea4)] enum ResyncEnum +{ + adResyncUnderlyingValues = 1, + adResyncAllValues = 2 +} ResyncEnum; + +typedef [uuid(0000051d-0000-0010-8000-00aa006d2ea4)] enum LockTypeEnum +{ + adLockUnspecified = -1, + adLockReadOnly = 1, + adLockPessimistic = 2, + adLockOptimistic = 3, + adLockBatchOptimistic = 4 +} LockTypeEnum; + +typedef [uuid(00000543-0000-0010-8000-00aa006d2ea4)] enum AffectEnum +{ + adAffectCurrent = 1, + adAffectGroup = 2, + adAffectAll = 3, + adAffectAllChapters = 4 +} AffectEnum; + +typedef [uuid(00000526-0000-0010-8000-00aa006d2ea4)] enum EditModeEnum +{ + adEditNone = 0, + adEditInProgress = 1, + adEditAdd = 2, + adEditDelete = 4 +} EditModeEnum; + +typedef [uuid(0000052f-0000-0010-8000-00aa006d2ea4)] enum CursorLocationEnum +{ + adUseNone = 1, + adUseServer = 2, + adUseClient = 3, + adUseClientBatch = 3 +} CursorLocationEnum; + +typedef [uuid(0000051c-0000-0010-8000-00aa006d2ea4)] enum CursorOptionEnum +{ + adHoldRecords = 256, + adMovePrevious = 512, + adBookmark = 8192, + adApproxPosition = 16384, + adUpdateBatch = 65536, + adResync = 131072, + adNotify = 262144, + adFind = 524288, + adSeek = 4194304, + adIndex = 8388608, + adAddNew = 16778240, + adDelete = 16779264, + adUpdate = 16809984 +} CursorOptionEnum; + +typedef [uuid(00000540-0000-0010-8000-00aa006d2ea4)] enum MarshalOptionsEnum +{ + adMarshalAll = 0, + adMarshalModifiedOnly = 1 +} MarshalOptionsEnum; + +typedef [uuid(00000547-0000-0010-8000-00aa006d2ea4)] enum SearchDirectionEnum +{ + adSearchForward = 1, + adSearchBackward = -1 +} SearchDirectionEnum; + +typedef [uuid(00000549-0000-0010-8000-00aa006d2ea4)] enum StringFormatEnum +{ + adClipString = 2 +} StringFormatEnum; + +typedef [uuid(00000545-0000-0010-8000-00aa006d2ea4)] enum CompareEnum +{ + adCompareLessThan = 0, + adCompareEqual = 1, + adCompareGreaterThan = 2, + adCompareNotEqual = 3, + adCompareNotComparable = 4 +} CompareEnum; + +typedef [uuid(00000523-0000-0010-8000-00aa006d2ea4)] enum IsolationLevelEnum +{ + adXactUnspecified = -1, + adXactChaos = 16, + adXactReadUncommitted = 256, + adXactBrowse = 256, + adXactCursorStability = 4096, + adXactReadCommitted = 4096, + adXactRepeatableRead = 65536, + adXactSerializable = 1048576, + adXactIsolated = 1048576 +} IsolationLevelEnum; + +typedef [uuid(00000521-0000-0010-8000-00aa006d2ea4)] enum ConnectModeEnum +{ + adModeUnknown = 0, + adModeRead = 1, + adModeWrite = 2, + adModeReadWrite = 3, + adModeShareDenyRead = 4, + adModeShareDenyWrite = 8, + adModeShareExclusive = 12, + adModeShareDenyNone = 16, + adModeRecursive = 4194304 +} ConnectModeEnum; + +typedef [uuid(00000533-0000-0010-8000-00aa006d2ea4)] enum SchemaEnum +{ + adSchemaProviderSpecific = -1, + adSchemaAsserts = 0, + adSchemaCatalogs = 1, + adSchemaCharacterSets = 2, + adSchemaCollations = 3, + adSchemaColumns = 4, + adSchemaCheckConstraints = 5, + adSchemaConstraintColumnUsage = 6, + adSchemaConstraintTableUsage = 7, + adSchemaKeyColumnUsage = 8, + adSchemaReferentialContraints = 9, + adSchemaReferentialConstraints = 9, + adSchemaTableConstraints = 10, + adSchemaColumnsDomainUsage = 11, + adSchemaIndexes = 12, + adSchemaColumnPrivileges = 13, + adSchemaTablePrivileges = 14, + adSchemaUsagePrivileges = 15, + adSchemaProcedures = 16, + adSchemaSchemata = 17, + adSchemaSQLLanguages = 18, + adSchemaStatistics = 19, + adSchemaTables = 20, + adSchemaTranslations = 21, + adSchemaProviderTypes = 22, + adSchemaViews = 23, + adSchemaViewColumnUsage = 24, + adSchemaViewTableUsage = 25, + adSchemaProcedureParameters = 26, + adSchemaForeignKeys = 27, + adSchemaPrimaryKeys = 28, + adSchemaProcedureColumns = 29, + adSchemaDBInfoKeywords = 30, + adSchemaDBInfoLiterals = 31, + adSchemaCubes = 32, + adSchemaDimensions = 33, + adSchemaHierarchies = 34, + adSchemaLevels = 35, + adSchemaMeasures = 36, + adSchemaProperties = 37, + adSchemaMembers = 38, + adSchemaTrustees = 39, + adSchemaFunctions = 40, + adSchemaActions = 41, + adSchemaCommands = 42, + adSchemaSets = 43 +} SchemaEnum; + +typedef [uuid(00000530-0000-0010-8000-00aa006d2ea4)] enum EventStatusEnum +{ + adStatusOK = 1, + adStatusErrorsOccurred = 2, + adStatusCantDeny = 3, + adStatusCancel = 4, + adStatusUnwantedEvent = 5 +} EventStatusEnum; + +typedef [uuid(0000052c-0000-0010-8000-00aa006d2ea4)] enum ParameterDirectionEnum +{ + adParamUnknown = 0, + adParamInput = 1, + adParamOutput = 2, + adParamInputOutput = 3, + adParamReturnValue = 4 +} ParameterDirectionEnum; + +typedef [uuid(0000052e-0000-0010-8000-00aa006d2ea4)] enum CommandTypeEnum +{ + adCmdUnspecified = -1, + adCmdUnknown = 8, + adCmdText = 1, + adCmdTable = 2, + adCmdStoredProc = 4, + adCmdFile = 256, + adCmdTableDirect = 512 +} CommandTypeEnum; + +typedef [uuid(00000532-0000-0010-8000-00aa006d2ea4)] enum ObjectStateEnum +{ + adStateClosed = 0, + adStateOpen = 1, + adStateConnecting = 2, + adStateExecuting = 4, + adStateFetching = 8 +} ObjectStateEnum; + +typedef [uuid(00000573-0000-0010-8000-00aa006d2ea4)] enum MoveRecordOptionsEnum +{ + adMoveUnspecified = -1, + adMoveOverWrite = 1, + adMoveDontUpdateLinks = 2, + adMoveAllowEmulation = 4 +} MoveRecordOptionsEnum; + +typedef [uuid(00000574-0000-0010-8000-00aa006d2ea4)] enum CopyRecordOptionsEnum +{ + adCopyUnspecified = -1, + adCopyOverWrite = 1, + adCopyAllowEmulation = 4, + adCopyNonRecursive = 2 +} CopyRecordOptionsEnum; + +typedef [uuid(00000570-0000-0010-8000-00aa006d2ea4)] enum RecordCreateOptionsEnum +{ + adCreateCollection = 0x00002000, + adCreateStructDoc = 0x80000000, + adCreateNonCollection = 0x00000000, + adOpenIfExists = 0x02000000, + adCreateOverwrite = 0x04000000, + adFailIfNotExists = -1 +} RecordCreateOptionsEnum; + +typedef [uuid(00000571-0000-0010-8000-00aa006d2ea4)] enum RecordOpenOptionsEnum +{ + adOpenRecordUnspecified = -1, + adOpenOutput = 0x00800000, + adOpenAsync = 0x00001000, + adDelayFetchStream = 0x00004000, + adDelayFetchFields = 0x00008000, + adOpenExecuteCommand = 0x00010000 +} RecordOpenOptionsEnum; + +typedef [uuid(0000057d-0000-0010-8000-00aa006d2ea4)] enum RecordTypeEnum +{ + adSimpleRecord = 0, + adCollectionRecord = 1, + adStructDoc = 2 +} RecordTypeEnum; + +typedef [uuid(00000576-0000-0010-8000-00aa006d2ea4)] enum StreamTypeEnum +{ + adTypeBinary = 1, + adTypeText = 2 +} StreamTypeEnum; + +typedef [uuid(00000577-0000-0010-8000-00aa006d2ea4)] enum LineSeparatorEnum +{ + adLF = 10, + adCR = 13, + adCRLF = -1 +} LineSeparatorEnum; + +typedef enum +{ + adReadAll = -1, + adReadLine = -2 +} StreamReadEnum; + +typedef [uuid(0000057c-0000-0010-8000-00aa006d2ea4)] enum SaveOptionsEnum +{ + adSaveCreateNotExist = 1, + adSaveCreateOverWrite = 2 +} SaveOptionsEnum; + +typedef [uuid(0000057a-0000-0010-8000-00aa006d2ea4)] enum StreamOpenOptionsEnum +{ + adOpenStreamUnspecified = -1, + adOpenStreamAsync = 1, + adOpenStreamFromRecord = 4 +} StreamOpenOptionsEnum; + +typedef [uuid(0000057b-0000-0010-8000-00aa006d2ea4)] enum StreamWriteEnum +{ + adWriteChar = 0, + adWriteLine = 1 +} StreamWriteEnum; + +typedef [uuid(00000531-0000-0010-8000-00aa006d2ea4)] enum EventReasonEnum +{ + adRsnAddNew = 1, + adRsnDelete = 2, + adRsnUpdate = 3, + adRsnUndoUpdate = 4, + adRsnUndoAddNew = 5, + adRsnUndoDelete = 6, + adRsnRequery = 7, + adRsnResynch = 8, + adRsnClose = 9, + adRsnMove = 10, + adRsnFirstChange = 11, + adRsnMoveFirst = 12, + adRsnMoveNext = 13, + adRsnMovePrevious = 14, + adRsnMoveLast = 15 +} EventReasonEnum; + +[ + uuid(00000503-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Property : IDispatch +{ + [id(00000000), propget] + HRESULT Value( + [out, retval] VARIANT *val); + + [id(00000000), propput] + HRESULT Value( + [in] VARIANT val); + + [id(0x60020002), propget] + HRESULT Name( + [out, retval] BSTR *str); + + [id(0x60020003), propget] + HRESULT Type( + [out, retval] DataTypeEnum *type); + + [id(0x60020004), propget] + HRESULT Attributes( + [out, retval] LONG *attributes); + + [id(0x60020004), propput] + HRESULT Attributes( + [in] LONG attributes); +}; + +[ + uuid(00000512-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _Collection : IDispatch +{ + [id(0x60020000), propget] + HRESULT Count( + [out, retval] LONG *count); + + [id(0xfffffffc), restricted] + HRESULT _NewEnum( + [out, retval] IUnknown **object); + + [id(0x60020002)] + HRESULT Refresh(); +}; + +[ + uuid(00000504-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Properties : _Collection +{ + [id(00000000), propget] + HRESULT Item( + [in] VARIANT index, + [out, retval] Property **object); +}; + +[ + uuid(00000534-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _ADO : IDispatch +{ + [id(0x000001f4), propget] + HRESULT Properties( + [out, retval] Properties **object); +}; + +[ + uuid(0000054c-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation, + hidden +] +interface Field20 : _ADO +{ + [id(0x00000455), propget] + HRESULT ActualSize( + [out, retval] LONG *size); + + [id(0x0000040c), propget] + HRESULT Attributes( + [out, retval] LONG *attrs); + + [id(0x0000044f), propget] + HRESULT DefinedSize( + [out, retval] LONG *size); + + [id(0x0000044c), propget] + HRESULT Name( + [out, retval] BSTR *str); + + [id(0x0000044e), propget] + HRESULT Type( + [out, retval] DataTypeEnum *type); + + [id(00000000), propget] + HRESULT Value( + [out, retval] VARIANT *val); + + [id(00000000), propput] + HRESULT Value( + [in] VARIANT val); + + [id(0x60030007), propget] + HRESULT Precision( + [out, retval] unsigned char *precision); + + [id(0x60030008), propget] + HRESULT NumericScale( + [out, retval] unsigned char *scale); + + [id(0x00000453)] + HRESULT AppendChunk( + [in] VARIANT data); + + [id(0x00000454)] + HRESULT GetChunk( + [in] LONG length, + [out, retval] VARIANT *var); + + [id(0x00000450), propget] + HRESULT OriginalValue( + [out, retval] VARIANT *val); + + [id(0x00000451), propget] + HRESULT UnderlyingValue( + [out, retval] VARIANT *val); + + [id(0x6003000d), propget] + HRESULT DataFormat( + [out, retval] IUnknown **format); + + [id(0x6003000d), propputref] + HRESULT DataFormat( + [in] IUnknown *format); + + [id(0x60030007), propput] + HRESULT Precision( + [in] unsigned char precision); + + [id(0x60030008), propput] + HRESULT NumericScale( + [in] unsigned char scale); + + [id(0x0000044e), propput] + HRESULT Type( + [in] DataTypeEnum type); + + [id(0x0000044f), propput] + HRESULT DefinedSize( + [in] LONG size); + + [id(0x0000040c), propput] + HRESULT Attributes( + [in] LONG attrs); +}; + +[ + uuid(00000569-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Field : Field20 +{ + [id(0x0000045c), propget] + HRESULT Status( + [out, retval] LONG *status); +}; + +[ + uuid(00000506-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Fields15 : _Collection +{ + [id(00000000), propget] + HRESULT Item( + [in] VARIANT index, + [out, retval] Field **object); +}; + +[ + uuid(0000054d-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Fields20 : Fields15 +{ + [id(0x60030001)] + HRESULT _Append( + [in] BSTR name, + [in] DataTypeEnum type, + [in, defaultvalue(0)] LONG size, + [in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr); + + [id(0x60030002)] + HRESULT Delete( + [in] VARIANT index); +}; + +[ + uuid(00000564-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Fields : Fields20 +{ + [id(0x60040001)] + HRESULT Append( + [in] BSTR name, + [in] DataTypeEnum type, + [in, defaultvalue(0)] LONG size, + [in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr, + [in, optional] VARIANT value); + + [id(0x60040002)] + HRESULT Update(); + + [id(0x60040003)] + HRESULT Resync( + [in, defaultvalue(adResyncAllValues)] ResyncEnum resync_values); + + [id(0x60040004)] + HRESULT CancelUpdate(); +}; + +[ + uuid(0000050e-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Recordset15 : _ADO +{ + [id(0x000003e8), propget] + HRESULT AbsolutePosition( + [out, retval] PositionEnum_Param *position); + + [id(0x000003e8), propput] + HRESULT AbsolutePosition( + [in] PositionEnum_Param position); + + [id(0x000003e9), propputref] + HRESULT ActiveConnection( + [in] IDispatch *connection); + + [id(0x000003e9), propput] + HRESULT ActiveConnection( + [in] VARIANT connection); + + [id(0x000003e9), propget] + HRESULT ActiveConnection( + [out, retval] VARIANT *connection); + + [id(0x000003ea), propget] + HRESULT BOF( + [out, retval] VARIANT_BOOL *bof); + + [id(0x000003eb), propget] + HRESULT Bookmark( + [out, retval] VARIANT *bookmark); + + [id(0x000003eb), propput] + HRESULT Bookmark( + [in] VARIANT bookmark); + + [id(0x000003ec), propget] + HRESULT CacheSize( + [out, retval] LONG *size); + + [id(0x000003ec), propput] + HRESULT CacheSize( + [in] LONG size); + + [id(0x000003ed), propget] + HRESULT CursorType( + [out, retval] CursorTypeEnum *cursor_type); + + [id(0x000003ed), propput] + HRESULT CursorType( + [in] CursorTypeEnum cursor_type); + + [id(0x000003ee), propget] + HRESULT EOF( + [out, retval] VARIANT_BOOL *eof); + + [id(00000000), propget] + HRESULT Fields( + [out, retval] Fields **object); + + [id(0x000003f0), propget] + HRESULT LockType( + [out, retval] LockTypeEnum *lock_type); + + [id(0x000003f0), propput] + HRESULT LockType( + [in] LockTypeEnum lock_type); + + [id(0x000003f1), propget] + HRESULT MaxRecords( + [out, retval] LONG *max_records); + + [id(0x000003f1), propput] + HRESULT MaxRecords( + [in] LONG max_records); + + [id(0x000003f2), propget] + HRESULT RecordCount( + [out, retval] LONG *count); + + [id(0x000003f3), propputref] + HRESULT Source( + [in] IDispatch *source); + + [id(0x000003f3), propput] + HRESULT Source( + [in] BSTR source); + + [id(0x000003f3), propget] + HRESULT Source( + [out, retval] VARIANT *source); + + [id(0x000003f4)] + HRESULT AddNew( + [in, optional] VARIANT field_list, + [in, optional] VARIANT values); + + [id(0x000003f5)] + HRESULT CancelUpdate(); + + [id(0x000003f6)] + HRESULT Close(); + + [id(0x000003f7)] + HRESULT Delete( + [in, defaultvalue(adAffectCurrent)] AffectEnum affect_records); + + [id(0x000003f8)] + HRESULT GetRows( + [in, defaultvalue(-1)] LONG rows, + [in, optional] VARIANT start, + [in, optional] VARIANT fields, + [out, retval] VARIANT *var); + + [id(0x000003f9)] + HRESULT Move( + [in] LONG num_records, + [in, optional] VARIANT start); + + [id(0x000003fa)] + HRESULT MoveNext(); + + [id(0x000003fb)] + HRESULT MovePrevious(); + + [id(0x000003fc)] + HRESULT MoveFirst(); + + [id(0x000003fd)] + HRESULT MoveLast(); + + [id(0x000003fe)] + HRESULT Open( + [in, optional] VARIANT source, + [in, optional] VARIANT active_connection, + [in, defaultvalue(adOpenUnspecified)] CursorTypeEnum cursor_type, + [in, defaultvalue(adLockUnspecified)] LockTypeEnum lock_type, + [in, defaultvalue(-1)] LONG options); + + [id(0x000003ff)] + HRESULT Requery( + [in, defaultvalue(-1)] LONG options); + + [id(0x60030022), hidden] + HRESULT _xResync( + [in, defaultvalue(adAffectAll)] AffectEnum affect_records); + + [id(0x00000401)] + HRESULT Update( + [in, optional] VARIANT fields, + [in, optional] VARIANT values); + + [id(0x00000417), propget] + HRESULT AbsolutePage( + [out, retval] PositionEnum_Param *position); + + [id(0x00000417), propput] + HRESULT AbsolutePage( + [in] PositionEnum_Param position); + + [id(0x00000402), propget] + HRESULT EditMode( + [out, retval] EditModeEnum *mode); + + [id(0x00000406), propget] + HRESULT Filter( + [out, retval] VARIANT *criteria); + + [id(0x00000406), propput] + HRESULT Filter( + [in] VARIANT criteria); + + [id(0x0000041a), propget] + HRESULT PageCount( + [out, retval] LONG *count); + + [id(0x00000418), propget] + HRESULT PageSize( + [out, retval] LONG *size); + + [id(0x00000418), propput] + HRESULT PageSize( + [in] LONG size); + + [id(0x00000407), propget] + HRESULT Sort( + [out, retval] BSTR *criteria); + + [id(0x00000407), propput] + HRESULT Sort( + [in] BSTR criteria); + + [id(0x00000405), propget] + HRESULT Status( + [out, retval] LONG *status); + + [id(0x0000041e), propget] + HRESULT State( + [out, retval] LONG *state); + + [id(0x60030030), hidden] + HRESULT _xClone( + [out, retval] _Recordset **object); + + [id(0x0000040b)] + HRESULT UpdateBatch( + [in, defaultvalue(adAffectAll)] AffectEnum affect_records); + + [id(0x00000419)] + HRESULT CancelBatch( + [in, defaultvalue(adAffectAll)] AffectEnum affect_records); + + [id(0x0000041b), propget] + HRESULT CursorLocation( + [out, retval] CursorLocationEnum *cursor_loc); + + [id(0x0000041b), propput] + HRESULT CursorLocation( + [in] CursorLocationEnum cursor_loc); + + [id(0x0000041c)] + HRESULT NextRecordset( + [out, optional] VARIANT *records_affected, + [out, retval] _Recordset **record_set); + + [id(0x0000040c)] + HRESULT Supports( + [in] CursorOptionEnum cursor_options, + [out, retval] VARIANT_BOOL *ret); + + [id(0xfffffff8), propget, hidden] + HRESULT Collect( + [in] VARIANT index, + [out, retval] VARIANT *var); + + [id(0xfffffff8), propput, hidden] + HRESULT Collect( + [in] VARIANT index, + [in] VARIANT var); + + [id(0x0000041d), propget] + HRESULT MarshalOptions( + [out, retval] MarshalOptionsEnum *options); + + [id(0x0000041d), propput] + HRESULT MarshalOptions( + [in] MarshalOptionsEnum options); + + [id(0x00000422)] + HRESULT Find( + [in] BSTR criteria, + [in, defaultvalue(0)] LONG skip_records, + [in, defaultvalue(adSearchForward)] SearchDirectionEnum search_direction, + [in, optional] VARIANT start); +}; + +[ + uuid(0000054f-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Recordset20 : Recordset15 +{ + [id(0x0000041f)] + HRESULT Cancel(); + + [id(0x00000420), propget] + HRESULT DataSource( + [out, retval] IUnknown **data_source); + + [id(0x00000420), propputref] + HRESULT DataSource( + [in] IUnknown *data_source); + + [hidden] + HRESULT _xSave( + [in, optional] BSTR filename, + [in, defaultvalue(adPersistADTG)] PersistFormatEnum persist_format); + + [id(0x00000425), propget] + HRESULT ActiveCommand( + [out, retval] IDispatch **cmd); + + [id(0x00000427), propput] + HRESULT StayInSync( + [in] VARIANT_BOOL stay_in_sync); + + [id(0x00000427), propget] + HRESULT StayInSync( + [out, retval] VARIANT_BOOL *stay_in_sync); + + [id(0x00000426)] + HRESULT GetString( + [in, defaultvalue(adClipString)] StringFormatEnum string_format, + [in, defaultvalue(-1)] LONG num_rows, + [in, optional] BSTR column_delimeter, + [in, optional] BSTR row_delimeter, + [in, optional] BSTR null_expr, + [out, retval] BSTR *ret_string); + + [id(0x00000428), propget] + HRESULT DataMember( + [out, retval] BSTR *data_member); + + [id(0x00000428), propput] + HRESULT DataMember( + [in] BSTR data_member); + + [id(0x00000429)] + HRESULT CompareBookmarks( + [in] VARIANT bookmark1, + [in] VARIANT bookmark2, + [out, retval] CompareEnum *compare); + + [id(0x0000040a)] + HRESULT Clone( + [in, defaultvalue(adLockUnspecified)] LockTypeEnum lock_type, + [out, retval] _Recordset **object); + + [id(0x00000400)] + HRESULT Resync( + [in, defaultvalue(adAffectAll)] AffectEnum affect_records, + [in, defaultvalue(adResyncAllValues)] ResyncEnum resync_values); +}; + +[ + uuid(00000555-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Recordset21 : Recordset20 +{ + [id(0x0000042a)] + HRESULT Seek( + [in] VARIANT key_values, + [in, defaultvalue(adSeekFirstEQ)] SeekEnum seek_option); + + [id(0x0000042b), propput] + HRESULT Index( + [in] BSTR index); + + [id(0x0000042b), propget] + HRESULT Index( + [out, retval] BSTR *index); +}; + +[ + uuid(00000556-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _Recordset : Recordset21 +{ + [id(0x00000421)] + HRESULT Save( + [in, optional] VARIANT destination, + [in, defaultvalue(adPersistADTG)] PersistFormatEnum persist_format); +}; + +[ + uuid(00000500-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Error : IDispatch +{ + [id(0x60020000), propget] + HRESULT Number( + [out, retval] LONG *number); + + [id(0x60020001), propget] + HRESULT Source( + [out, retval] BSTR *str); + + [id(00000000), propget] + HRESULT Description( + [out, retval] BSTR *str); + + [id(0x60020003), propget] + HRESULT HelpFile( + [out, retval] BSTR *str); + + [id(0x60020004), propget] + HRESULT HelpContext( + [out, retval] LONG *ctx); + + [id(0x60020005), propget] + HRESULT SQLState( + [out, retval] BSTR *str); + + [id(0x60020006), propget] + HRESULT NativeError( + [out, retval] LONG *error); +}; + +[ + uuid(00000501-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Errors : _Collection +{ + [id(00000000), propget] + HRESULT Item( + [in] VARIANT index, + [out, retval] Error **object); + + [id(0x60030001)] + HRESULT Clear(); +}; + +[ + uuid(00000515-0000-0010-8000-00aa006d2ea4), + odl, + dual, + oleautomation +] +interface Connection15 : _ADO +{ + [id(00000000), propget] + HRESULT ConnectionString( + [out, retval] BSTR *str); + + [id(00000000), propput] + HRESULT ConnectionString( + [in] BSTR str); + + [id(0x00000002), propget] + HRESULT CommandTimeout( + [out, retval] LONG *timeout); + + [id(0x00000002), propput] + HRESULT CommandTimeout( + [in] LONG timeout); + + [id(0x00000003), propget] + HRESULT ConnectionTimeout( + [out, retval] LONG *timeout); + + [id(0x00000003), propput] + HRESULT ConnectionTimeout( + [in] LONG timeout); + + [id(0x00000004), propget] + HRESULT Version( + [out, retval] BSTR *str); + + [id(0x00000005)] + HRESULT Close(); + + [id(0x00000006)] + HRESULT Execute( + [in] BSTR command, + [out, optional] VARIANT *records_affected, + [in, defaultvalue(-1)] LONG options, + [out, retval] _Recordset **record_set); + + [id(0x00000007)] + HRESULT BeginTrans( + [out, retval] LONG *transaction_level); + + [id(0x00000008)] + HRESULT CommitTrans(); + + [id(0x00000009)] + HRESULT RollbackTrans(); + + [id(0x0000000a)] + HRESULT Open( + [in, defaultvalue("")] BSTR connection_str, + [in, defaultvalue("")] BSTR user_id, + [in, defaultvalue("")] BSTR password, + [in, defaultvalue(-1)] LONG options); + + [id(0x0000000b), propget] + HRESULT Errors( + [out, retval] Errors **object); + + [id(0x0000000c), propget] + HRESULT DefaultDatabase( + [out, retval] BSTR *str); + + [id(0x0000000c), propput] + HRESULT DefaultDatabase( + [in] BSTR str); + + [id(0x0000000d), propget] + HRESULT IsolationLevel( + [out, retval] IsolationLevelEnum *level); + + [id(0x0000000d), propput] + HRESULT IsolationLevel( + [in] IsolationLevelEnum level); + + [id(0x0000000e), propget] + HRESULT Attributes( + [out, retval] LONG *attr); + + [id(0x0000000e), propput] + HRESULT Attributes( + [in] LONG attr); + + [id(0x0000000f), propget] + HRESULT CursorLocation( + [out, retval] CursorLocationEnum *cursor_loc); + + [id(0x0000000f), propput] + HRESULT CursorLocation( + [in] CursorLocationEnum cursor_loc); + + [id(0x00000010), propget] + HRESULT Mode( + [out, retval] ConnectModeEnum *mode); + + [id(0x00000010), propput] + HRESULT Mode( + [in] ConnectModeEnum mode); + + [id(0x00000011), propget] + HRESULT Provider( + [out, retval] BSTR *str); + + [id(0x00000011), propput] + HRESULT Provider( + [in] BSTR str); + + [id(0x00000012), propget] + HRESULT State( + [out, retval] LONG *state); + + [id(0x00000013)] + HRESULT OpenSchema( + [in] SchemaEnum schema, + [in, optional] VARIANT restrictions, + [in, optional] VARIANT schema_id, + [out, retval] _Recordset **record_set); +}; + +[ + uuid(00000550-0000-0010-8000-00aa006d2ea4), + odl, + dual, + oleautomation +] +interface _Connection : Connection15 +{ + [id(0x00000015)] + HRESULT Cancel(); +}; + +[ + uuid(0000050c-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _Parameter : _ADO +{ + [id(0x60030000), propget] + HRESULT Name( + [out, retval] BSTR *str); + + [id(0x60030000), propput] + HRESULT Name( + [in] BSTR str); + + [id(00000000), propget] + HRESULT Value( + [out, retval] VARIANT *val); + + [id(00000000), propput] + HRESULT Value( + [in] VARIANT val); + + [id(0x60030004), propget] + HRESULT Type( + [out, retval] DataTypeEnum *data_type); + + [id(0x60030004), propput] + HRESULT Type( + [in] DataTypeEnum data_type); + + [id(0x60030006), propput] + HRESULT Direction( + [in] ParameterDirectionEnum direction); + + [id(0x60030006), propget] + HRESULT Direction( + [out, retval] ParameterDirectionEnum *direction); + + [id(0x60030008), propput] + HRESULT Precision( + [in] unsigned char precision); + + [id(0x60030008), propget] + HRESULT Precision( + [out, retval] unsigned char *precision); + + [id(0x6003000a), propput] + HRESULT NumericScale( + [in] unsigned char scale); + + [id(0x6003000a), propget] + HRESULT NumericScale( + [out, retval] unsigned char *scale); + + [id(0x6003000c), propput] + HRESULT Size( + [in] LONG size); + + [id(0x6003000c), propget] + HRESULT Size( + [out, retval] LONG *size); + + [id(0x6003000e)] + HRESULT AppendChunk( + [in] VARIANT val); + + [id(0x6003000f), propget] + HRESULT Attributes( + [out, retval] LONG *attrs); + + [id(0x6003000f), propput] + HRESULT Attributes( + [in] LONG attrs); +}; + +[ + uuid(00000513-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _DynaCollection : _Collection +{ + [id(0x60030000)] + HRESULT Append( + [in] IDispatch *object); + + [id(0x60030001)] + HRESULT Delete( + [in] VARIANT index); +}; + +[ + uuid(0000050d-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Parameters : _DynaCollection +{ + [id(00000000), propget] + HRESULT Item( + [in] VARIANT index, + [out, retval] _Parameter **object); +}; + +[ + uuid(00000508-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Command15 : _ADO +{ + [id(0x60030000), propget] + HRESULT ActiveConnection( + [out, retval] _Connection **object); + + [id(0x60030000), propputref] + HRESULT ActiveConnection( + [in] _Connection *object); + + [id(0x60030000), propput] + HRESULT ActiveConnection( + [in] VARIANT object); + + [id(0x60030003), propget] + HRESULT CommandText( + [out, retval] BSTR *str); + + [id(0x60030003), propput] + HRESULT CommandText( + [in] BSTR str); + + [id(0x60030005), propget] + HRESULT CommandTimeout( + [out, retval] LONG *timeout); + + [id(0x60030005), propput] + HRESULT CommandTimeout( + [in] LONG timeout); + + [id(0x60030007), propget] + HRESULT Prepared( + [out, retval] VARIANT_BOOL *prepared); + + [id(0x60030007), propput] + HRESULT Prepared( + [in] VARIANT_BOOL prepared); + + [id(0x60030009)] + HRESULT Execute( + [out, optional] VARIANT *records_affected, + [in, optional] VARIANT *parameters, + [in, defaultvalue(-1)] LONG options, + [out, retval] _Recordset **record_set); + + [id(0x6003000a)] + HRESULT CreateParameter( + [in, defaultvalue("")] BSTR name, + [in, defaultvalue(adEmpty)] DataTypeEnum type, + [in, defaultvalue(adParamInput)] ParameterDirectionEnum direction, + [in, defaultvalue(0)] LONG size, + [in, optional] VARIANT value, + [out, retval] _Parameter **parameter); + + [id(00000000), propget] + HRESULT Parameters( + [out, retval] Parameters **object); + + [id(0x6003000c), propput] + HRESULT CommandType( + [in] CommandTypeEnum cmd_type); + + [id(0x6003000c), propget] + HRESULT CommandType( + [out, retval] CommandTypeEnum *cmd_type); + + [id(0x6003000e), propget] + HRESULT Name( + [out, retval] BSTR *name); + + [id(0x6003000e), propput] + HRESULT Name( + [in] BSTR name); +}; + +[ + uuid(0000054e-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Command25 : Command15 +{ + [id(0x60030010), propget] + HRESULT State( + [out, retval] LONG *state); + + [id(0x60030011)] + HRESULT Cancel(); +}; + +[ + uuid(b08400bd-f9d1-4d02-b856-71d5dba123e9), + odl, + dual, + nonextensible, + oleautomation +] +interface _Command : Command25 +{ + [id(0x60030012), propputref] + HRESULT CommandStream( + [in] IUnknown *stream); + + [id(0x60030012), propget] + HRESULT CommandStream( + [out, retval] VARIANT *stream); + + [id(0x60030013), propput] + HRESULT Dialect( + [in] BSTR dialect); + + [id(0x60030013), propget] + HRESULT Dialect( + [out, retval] BSTR *dialect); + + [id(0x60030014), propput] + HRESULT NamedParameters( + [in] VARIANT_BOOL named_parameters); + + [id(0x60030014), propget] + HRESULT NamedParameters( + [out, retval] VARIANT_BOOL *named_parameters); +}; + +[ + uuid(00000400-0000-0010-8000-00aa006d2ea4) +] +dispinterface ConnectionEvents +{ + properties: + methods: + [id(00000000)] + HRESULT InfoMessage( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *Connection); + + [id(0x00000001)] + HRESULT BeginTransComplete( + [in] LONG TransactionLevel, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + [id(0x00000003)] + HRESULT CommitTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + [id(0x00000002)] + HRESULT RollbackTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + [id(0x00000004)] + HRESULT WillExecute( + [in, out] BSTR *source, + [in, out] CursorTypeEnum *cursor_type, + [in, out] LockTypeEnum *lock_type, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + [id(0x00000005)] + HRESULT ExecuteComplete( + [in] LONG records_affected, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + [id(0x00000006)] + HRESULT WillConnect( + [in, out] BSTR *string, + [in, out] BSTR *userid, + [in, out] BSTR *password, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + [id(0x00000007)] + HRESULT ConnectComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + [id(0x00000008)] + HRESULT Disconnect( + [in, out] EventStatusEnum *status, + [in] _Connection *connection); +}; + +[ + uuid(00000562-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _Record : _ADO +{ + [id(1), propget] + HRESULT ActiveConnection( + [out, retval] VARIANT *connection); + + [id(1), propput] + HRESULT ActiveConnection( + [in] BSTR connection); + + [id(1), propputref] + HRESULT ActiveConnection( + [in] _Connection *connection); + + [id(2), propget] + HRESULT State( + [out, retval] ObjectStateEnum *state); + + [id(3), propget] + HRESULT Source( + [out, retval] VARIANT *source); + + [id(3), propput] + HRESULT Source( + [in] BSTR source); + + [id(3), propputref] + HRESULT Source( + [in] IDispatch *source); + + [id(4), propget] + HRESULT Mode( + [out, retval] ConnectModeEnum *mode); + + [id(4), propput] + HRESULT Mode( + [in] ConnectModeEnum mode); + + [id(5), propget] + HRESULT ParentURL( + [out, retval] BSTR *parent_URL); + + [id(6)] + HRESULT MoveRecord( + [in, defaultvalue("")] BSTR source, + [in, defaultvalue("")] BSTR Destination, + [in, optional] BSTR UserName, + [in, optional] BSTR Password, + [in, defaultvalue(adMoveUnspecified)] MoveRecordOptionsEnum Options, + [in, optional] VARIANT_BOOL Async, + [out, retval] BSTR *pbstrNewURL); + + [id(7)] + HRESULT CopyRecord( + [in, defaultvalue("")] BSTR source, + [in, defaultvalue("")] BSTR destination, + [in, optional] BSTR username, + [in, optional] BSTR password, + [in, defaultvalue(adCopyUnspecified)] CopyRecordOptionsEnum options, + [in, optional] VARIANT_BOOL async, + [out, retval] BSTR *new_URL); + + [id(8)] + HRESULT DeleteRecord( + [in] BSTR source, + [in, optional] VARIANT_BOOL async); + + [id(9)] + HRESULT Open( + [in, optional] VARIANT source, + [in, optional] VARIANT active_connection, + [in, optional] ConnectModeEnum mode, + [in, defaultvalue(adFailIfNotExists)] RecordCreateOptionsEnum create_options, + [in, defaultvalue(adOpenRecordUnspecified)] RecordOpenOptionsEnum options, + [in, optional] BSTR username, + [in, optional] BSTR password); + + [id(10)] + HRESULT Close(); + + [id(0), propget] + HRESULT Fields( + [out, retval] Fields **fields); + + [id(11), propget] + HRESULT RecordType( + [out, retval] RecordTypeEnum *type); + + [id(12)] + HRESULT GetChildren( + [out, retval] _Recordset **record_set); + + [id(13)] + HRESULT Cancel(); +}; + +[ + uuid(00000565-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _Stream : IDispatch +{ + [id(1), propget] + HRESULT Size( + [out, retval] LONG *size); + + [id(2), propget] + HRESULT EOS( + [out, retval] VARIANT_BOOL *eos); + + [id(3), propget] + HRESULT Position( + [out, retval] LONG *position); + + [id(3), propput] + HRESULT Position( + [in] LONG position); + + [id(4), propget] + HRESULT Type( + [out, retval] StreamTypeEnum *type); + + [id(4), propput] + HRESULT Type( + [in] StreamTypeEnum type); + + [id(5), propget] + HRESULT LineSeparator( + [out, retval] LineSeparatorEnum *separator); + + [id(5), propput] + HRESULT LineSeparator( + [in] LineSeparatorEnum separator); + + [id(6), propget] + HRESULT State( + [out, retval] ObjectStateEnum *state); + + [id(7), propget] + HRESULT Mode( + [out, retval] ConnectModeEnum *mode); + + [id(7), propput] + HRESULT Mode( + [in] ConnectModeEnum mode); + + [id(8), propget] + HRESULT Charset( + [out, retval] BSTR *charset); + + [id(8), propput] + HRESULT Charset( + [in] BSTR charset); + + [id(9)] + HRESULT Read( + [in, defaultvalue(adReadAll)] LONG num_bytes, + [out, retval] VARIANT *val); + + [id(10)] + HRESULT Open( + [in, optional] VARIANT source, + [in, defaultvalue(adModeUnknown)] ConnectModeEnum mode, + [in, defaultvalue(adOpenStreamUnspecified)] StreamOpenOptionsEnum options, + [in, optional] BSTR username, + [in, optional] BSTR password); + + [id(11)] + HRESULT Close(void); + + [id(12)] + HRESULT SkipLine(void); + + [id(13)] + HRESULT Write( + [in] VARIANT buffer); + + [id(14)] + HRESULT SetEOS(void); + + [id(15)] + HRESULT CopyTo( + [in] _Stream *dest, + [in, defaultvalue(-1)] LONG size); + + [id(16)] + HRESULT Flush(void); + + [id(17)] + HRESULT SaveToFile( + [in] BSTR FileName, + [in, defaultvalue(adSaveCreateNotExist)] SaveOptionsEnum options); + + [id(18)] + HRESULT LoadFromFile( + [in] BSTR filename); + + [id(19)] + HRESULT ReadText( + [in, defaultvalue(adReadAll)] LONG size, + [out, retval] BSTR *str); + + [id(20)] + HRESULT WriteText( + [in] BSTR data, + [in, defaultvalue(adWriteChar)] StreamWriteEnum options); + + [id(21)] + HRESULT Cancel(void); +}; + +[ + uuid(00000266-0000-0010-8000-00aa006d2ea4) +] +dispinterface RecordsetEvents +{ + properties: + methods: + [id(0x00000009)] + HRESULT WillChangeField( + [in] LONG count, + [in] VARIANT fields, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000a)] + HRESULT FieldChangeComplete( + [in] LONG count, + [in] VARIANT fields, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000b)] + HRESULT WillChangeRecord( + [in] EventReasonEnum reason, + [in] LONG count, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000c)] + HRESULT RecordChangeComplete( + [in] EventReasonEnum reason, + [in] LONG count, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000d)] + HRESULT WillChangeRecordset( + [in] EventReasonEnum reason, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000e)] + HRESULT RecordsetChangeComplete( + [in] EventReasonEnum reason, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000f)] + HRESULT WillMove( + [in] EventReasonEnum reason, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x00000010)] + HRESULT MoveComplete( + [in] EventReasonEnum reason, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x00000011)] + HRESULT EndOfRecordset( + [in, out] VARIANT_BOOL *more_data, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x00000012)] + HRESULT FetchProgress( + [in] LONG progress, + [in] LONG max_progress, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x00000013)] + HRESULT FetchComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); +}; + +[ + uuid(00000538-0000-0010-8000-00aa006d2ea4), + odl, + hidden +] +interface ADODebugging : IUnknown +{ + HRESULT IsGlobalDebugMode( + VARIANT_BOOL *debugging_on); + + HRESULT SetGlobalDebugMode( + IUnknown *debugger, + VARIANT_BOOL debugging_on); +}; + +[ + uuid(00000516-0000-0010-8000-00aa006d2ea4), + odl, + restricted +] +interface ADOConnectionConstruction15 : IUnknown +{ + [propget] + HRESULT DSO( + [out, retval] IUnknown **dso); + + [propget] + HRESULT Session( + [out, retval] IUnknown **session); + + HRESULT WrapDSOandSession( + [in] IUnknown *dso, + [in] IUnknown *session); +}; + +[ + uuid(00000551-0000-0010-8000-00aa006d2ea4), + odl, + restricted +] +interface ADOConnectionConstruction : ADOConnectionConstruction15 +{ +}; + +[ + uuid(00000517-0000-0010-8000-00aa006d2ea4), + odl, + restricted +] +interface ADOCommandConstruction : IUnknown +{ + [propget] + HRESULT OLEDBCommand( + [out, retval] IUnknown **command); + + [propput] + HRESULT OLEDBCommand( + [in] IUnknown *command); +}; + +[ + uuid(00000283-0000-0010-8000-00aa006d2ea4), + odl, + restricted +] +interface ADORecordsetConstruction : IDispatch +{ + [propget] + HRESULT Rowset( + [out, retval] IUnknown **row_set); + + [propput] + HRESULT Rowset( + [in] IUnknown *row_set); + + [propget] + HRESULT Chapter( + [out, retval] LONG *chapter); + + [propput] + HRESULT Chapter( + [in] LONG chapter); + + [propget] + HRESULT RowPosition( + [out, retval] IUnknown **row_pos); + + [propput] + HRESULT RowPosition( + [in] IUnknown *row_pos); +}; + +[ + uuid(2a75196c-d9eb-4129-b803-931327f72d5c), + version(2.8) +] +library ADODB +{ + importlib("stdole2.tlb"); + + [ + uuid(00000514-0000-0010-8000-00aa006d2ea4), + ] + coclass Connection + { + [default] interface _Connection; + [default, source] dispinterface ConnectionEvents; + }; + + [ + uuid(00000507-0000-0010-8000-00aa006d2ea4), + ] + coclass Command + { + [default] interface _Command; + }; + + [ + uuid(00000535-0000-0010-8000-00aa006d2ea4), + ] + coclass Recordset + { + [default] interface _Recordset; + [default, source] dispinterface RecordsetEvents; + }; + + [ + uuid(0000050b-0000-0010-8000-00aa006d2ea4), + ] + coclass Parameter + { + [default] interface _Parameter; + }; + + [ + uuid(00000560-0000-0010-8000-00aa006d2ea4), + ] + coclass Record + { + [default] interface _Record; + }; + + [ + uuid(00000566-0000-0010-8000-00aa006d2ea4), + ] + coclass Stream + { + [default] interface _Stream; + }; +} -- 2.20.1

1 0

[PATCH 2/2] msvcrt: Provide exp2 in importlib.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/mathf.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH 1/2] makedep: Build implib cross object files with -fno-builtin.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

We want to be specific about used function and not want optimizations to interfere. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 10/10] vbscript/tests: Add initial tests for the script TypeInfo.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/vbscript.c | 271 +++++++++++++++++++++++++++++++++ 1 file changed, 271 insertions(+)

1 0

[PATCH 09/10] vbscript: Implement ScriptTypeInfo_GetTypeComp.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 60 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-)

1 0

[PATCH 08/10] vbscript: Implement ScriptTypeInfo_GetIDsOfNames.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 45 +++++++++++++++++++++++++++++++++-- dlls/vbscript/vbscript.h | 1 + dlls/vbscript/vbscript_main.c | 25 +++++++++++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-)

1 0

[PATCH 07/10] vbscript: Implement ScriptTypeInfo_GetVarDesc.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)

1 0

[PATCH 06/10] vbscript: Implement ScriptTypeInfo_GetFuncDesc.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)

1 0

[PATCH 05/10] vbscript: Implement ScriptTypeInfo_GetTypeAttr.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-)

1 0

[PATCH 04/10] vbscript: Store the necessary function and variable info in the script TypeInfo.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> The TypeInfo is built when it is retrieved and frozen at that moment, even if the script changes after that and more identifiers are added to it, or existing ones replaced. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 45 ++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 5 +++++ 2 files changed, 50 insertions(+)

1 0

[PATCH 03/10] vbscript: Copy the variable names into the script dispatch's heap.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbscript.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 02/10] vbscript: Reference count the vbscode_t.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 4 +++- dlls/vbscript/vbscript.c | 11 +++++++++-- dlls/vbscript/vbscript.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-)

1 0

[PATCH 01/10] vbscript: Move the global lists to the script dispatch object.
by Jacek Caban Dec. 6, 2019

Dec. 6, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 15 +++++---- dlls/vbscript/interp.c | 39 +++++++++++----------- dlls/vbscript/vbdisp.c | 34 +++++++++++++------ dlls/vbscript/vbscript.c | 70 +++++++++++++--------------------------- dlls/vbscript/vbscript.h | 41 ++++++++++++----------- 5 files changed, 97 insertions(+), 102 deletions(-)

1 0

[PATCH 1/5] msado15: Add typelib.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 ++++++++++++++++++++++++++++++++ 7 files changed, 2194 insertions(+) create mode 100644 dlls/msado15/Makefile.in create mode 100644 dlls/msado15/main.c create mode 100644 dlls/msado15/msado15.spec create mode 100644 dlls/msado15/msado15_tlb.idl create mode 100644 include/msado15_backcompat.idl diff --git a/configure.ac b/configure.ac index 7f2c3cda23..06ac9c6c71 100644 --- a/configure.ac +++ b/configure.ac @@ -3438,6 +3438,7 @@ WINE_CONFIG_MAKEFILE(dlls/msacm.dll16,enable_win16) 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/msadp32.acm) WINE_CONFIG_MAKEFILE(dlls/msasn1) WINE_CONFIG_MAKEFILE(dlls/mscat32) diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in new file mode 100644 index 0000000000..779a18df14 --- /dev/null +++ b/dlls/msado15/Makefile.in @@ -0,0 +1,8 @@ +MODULE = msado15.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c \ + +IDL_SRCS = msado15_tlb.idl diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c new file mode 100644 index 0000000000..0c5b2615d0 --- /dev/null +++ b/dlls/msado15/main.c @@ -0,0 +1,55 @@ +/* + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +static HINSTANCE hinstance; + +BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + hinstance = dll; + DisableThreadLibraryCalls( dll ); + break; + } + return TRUE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer( void ) +{ + return __wine_register_resources( hinstance ); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer( void ) +{ + return __wine_unregister_resources( hinstance ); +} diff --git a/dlls/msado15/msado15.spec b/dlls/msado15/msado15.spec new file mode 100644 index 0000000000..6d0e061a53 --- /dev/null +++ b/dlls/msado15/msado15.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/msado15/msado15_tlb.idl b/dlls/msado15/msado15_tlb.idl new file mode 100644 index 0000000000..f3a77df3ac --- /dev/null +++ b/dlls/msado15/msado15_tlb.idl @@ -0,0 +1,21 @@ +/* + * 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 + */ + +#pragma makedep regtypelib + +#include "msado15_backcompat.idl" diff --git a/include/Makefile.in b/include/Makefile.in index 421e3d6c59..2e9a921df7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -394,6 +394,7 @@ SOURCES = \ msacm.h \ msacmdlg.h \ msacmdrv.h \ + msado15_backcompat.idl \ msasn1.h \ mscat.h \ mscoree.idl \ diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl new file mode 100644 index 0000000000..1ff81cf856 --- /dev/null +++ b/include/msado15_backcompat.idl @@ -0,0 +1,2104 @@ +/* + * 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 + */ + +import "oaidl.idl"; + +interface _ADO; +interface _Collection; +interface _Command; +interface _Connection; +interface _DynaCollection; +interface _Parameter; +interface _Record; +interface _Recordset; +interface _Stream; +interface ADODebugging; +interface ADOConnectionConstruction; +interface ADOCommandConstruction; +interface ADORecordsetConstruction; +interface Command15; +interface Command25; +interface Error; +interface Errors; +interface Field; +interface Field15; +interface Field20; +interface Fields; +interface Fields15; +interface Fields20; +interface Parameters; +interface Properties; +interface Property; +interface Recordset15; +interface Recordset20; +interface Recordset21; +dispinterface ConnectionEvents; +dispinterface RecordsetEvents; + +typedef [uuid(0000052A-0000-0010-8000-00AA006D2EA4)] enum ErrorValueEnum +{ + adErrInvalidArgument = 3001, + adErrOpeningFile = 3002, + adErrReadFile = 3003, + adErrWriteFile = 3004, + adErrNoCurrentRecord = 3021, + adErrIllegalOperation = 3219, + adErrCantChangeProvider = 3220, + adErrInTransaction = 3246, + adErrFeatureNotAvailable = 3251, + adErrItemNotFound = 3265, + adErrObjectInCollection = 3367, + adErrObjectNotSet = 3420, + adErrDataConversion = 3421, + adErrObjectClosed = 3704, + adErrObjectOpen = 3705, + adErrProviderNotFound = 3706, + adErrBoundToCommand = 3707, + adErrInvalidParamInfo = 3708, + adErrInvalidConnection = 3709, + adErrNotReentrant = 3710, + adErrStillExecuting = 3711, + adErrOperationCancelled = 3712, + adErrStillConnecting = 3713, + adErrInvalidTransaction = 3714, + adErrNotExecuting = 3715, + adErrUnsafeOperation = 3716, + adWrnSecurityDialog = 3717, + adWrnSecurityDialogHeader = 3718, + adErrIntegrityViolation = 3719, + adErrPermissionDenied = 3720, + adErrDataOverflow = 3721, + adErrSchemaViolation = 3722, + adErrSignMismatch = 3723, + adErrCantConvertvalue = 3724, + adErrCantCreate = 3725, + adErrColumnNotOnThisRow = 3726, + adErrURLDoesNotExist = 3727, + adErrTreePermissionDenied = 3728, + adErrInvalidURL = 3729, + adErrResourceLocked = 3730, + adErrResourceExists = 3731, + adErrCannotComplete = 3732, + adErrVolumeNotFound = 3733, + adErrOutOfSpace = 3734, + adErrResourceOutOfScope = 3735, + adErrUnavailable = 3736, + adErrURLNamedRowDoesNotExist = 3737, + adErrDelResOutOfScope = 3738, + adErrPropInvalidColumn = 3739, + adErrPropInvalidOption = 3740, + adErrPropInvalidValue = 3741, + adErrPropConflicting = 3742, + adErrPropNotAllSettable = 3743, + adErrPropNotSet = 3744, + adErrPropNotSettable = 3745, + adErrPropNotSupported = 3746, + adErrCatalogNotSet = 3747, + adErrCantChangeConnection = 3748, + adErrFieldsUpdateFailed = 3749, + adErrDenyNotSupported = 3750, + adErrDenyTypeNotSupported = 3751, + adErrProviderNotSpecified = 3753, + adErrConnectionStringTooLong = 3754 +} ErrorValueEnum; + +typedef [uuid(00000528-0000-0010-8000-00aa006d2ea4)] enum PositionEnum +{ + adPosUnknown = -1, + adPosBOF = -2, + adPosEOF = -3 +} PositionEnum; + +typedef [uuid(a56187c5-d690-4037-ae32-a00edc376ac3), public] PositionEnum PositionEnum_Param; + +typedef [uuid(0000051f-0000-0010-8000-00aa006d2ea4)] enum DataTypeEnum +{ + adEmpty = 0, + adTinyInt = 16, + adSmallInt = 2, + adInteger = 3, + adBigInt = 20, + adUnsignedTinyInt = 17, + adUnsignedSmallInt = 18, + adUnsignedInt = 19, + adUnsignedBigInt = 21, + adSingle = 4, + adDouble = 5, + adCurrency = 6, + adDecimal = 14, + adNumeric = 131, + adBoolean = 11, + adError = 10, + adUserDefined = 132, + adVariant = 12, + adIDispatch = 9, + adIUnknown = 13, + adGUID = 72, + adDate = 7, + adDBDate = 133, + adDBTime = 134, + adDBTimeStamp = 135, + adBSTR = 8, + adChar = 129, + adVarChar = 200, + adLongVarChar = 201, + adWChar = 130, + adVarWChar = 202, + adLongVarWChar = 203, + adBinary = 128, + adVarBinary = 204, + adLongVarBinary = 205, + adChapter = 136, + adFileTime = 64, + adPropVariant = 138, + adVarNumeric = 139, + adArray = 0x2000 +} DataTypeEnum; + +typedef [uuid(00000548-0000-0010-8000-00aa006d2ea4)] enum PersistFormatEnum +{ + adPersistADTG = 0, + adPersistXML = 1 +} PersistFormatEnum; + +typedef [uuid(00000552-0000-0010-8000-00aa006d2ea4)] enum SeekEnum +{ + adSeekFirstEQ = 1, + adSeekLastEQ = 2, + adSeekAfterEQ = 4, + adSeekAfter = 8, + adSeekBeforeEQ = 16, + adSeekBefore = 32 +} SeekEnum; + +typedef [uuid(0000051b-0000-0010-8000-00aa006d2ea4)] enum CursorTypeEnum +{ + adOpenUnspecified = -1, + adOpenForwardOnly = 0, + adOpenKeyset = 1, + adOpenDynamic = 2, + adOpenStatic = 3 +} CursorTypeEnum; + +typedef [uuid(00000525-0000-0010-8000-00aa006d2ea4)] enum FieldAttributeEnum +{ + adFldUnspecified = -1, + adFldMayDefer = 0x00000002, + adFldUpdatable = 0x00000004, + adFldUnknownUpdatable = 0x00000008, + adFldFixed = 0x00000010, + adFldIsNullable = 0x00000020, + adFldMayBeNull = 0x00000040, + adFldLong = 0x00000080, + adFldRowID = 0x00000100, + adFldRowVersion = 0x00000200, + adFldCacheDeferred = 0x00001000, + adFldIsChapter = 0x00002000, + adFldNegativeScale = 0x00004000, + adFldKeyColumn = 0x00008000, + adFldIsRowURL = 0x00010000, + adFldIsDefaultStream = 0x00020000, + adFldIsCollection = 0x00040000 +} FieldAttributeEnum; + +typedef [uuid(00000544-0000-0010-8000-00aa006d2ea4)] enum ResyncEnum +{ + adResyncUnderlyingValues = 1, + adResyncAllValues = 2 +} ResyncEnum; + +typedef [uuid(0000051d-0000-0010-8000-00aa006d2ea4)] enum LockTypeEnum +{ + adLockUnspecified = -1, + adLockReadOnly = 1, + adLockPessimistic = 2, + adLockOptimistic = 3, + adLockBatchOptimistic = 4 +} LockTypeEnum; + +typedef [uuid(00000543-0000-0010-8000-00aa006d2ea4)] enum AffectEnum +{ + adAffectCurrent = 1, + adAffectGroup = 2, + adAffectAll = 3, + adAffectAllChapters = 4 +} AffectEnum; + +typedef [uuid(00000526-0000-0010-8000-00aa006d2ea4)] enum EditModeEnum +{ + adEditNone = 0, + adEditInProgress = 1, + adEditAdd = 2, + adEditDelete = 4 +} EditModeEnum; + +typedef [uuid(0000052f-0000-0010-8000-00aa006d2ea4)] enum CursorLocationEnum +{ + adUseNone = 1, + adUseServer = 2, + adUseClient = 3, + adUseClientBatch = 3 +} CursorLocationEnum; + +typedef [uuid(0000051c-0000-0010-8000-00aa006d2ea4)] enum CursorOptionEnum +{ + adHoldRecords = 256, + adMovePrevious = 512, + adBookmark = 8192, + adApproxPosition = 16384, + adUpdateBatch = 65536, + adResync = 131072, + adNotify = 262144, + adFind = 524288, + adSeek = 4194304, + adIndex = 8388608, + adAddNew = 16778240, + adDelete = 16779264, + adUpdate = 16809984 +} CursorOptionEnum; + +typedef [uuid(00000540-0000-0010-8000-00aa006d2ea4)] enum MarshalOptionsEnum +{ + adMarshalAll = 0, + adMarshalModifiedOnly = 1 +} MarshalOptionsEnum; + +typedef [uuid(00000547-0000-0010-8000-00aa006d2ea4)] enum SearchDirectionEnum +{ + adSearchForward = 1, + adSearchBackward = -1 +} SearchDirectionEnum; + +typedef [uuid(00000549-0000-0010-8000-00aa006d2ea4)] enum StringFormatEnum +{ + adClipString = 2 +} StringFormatEnum; + +typedef [uuid(00000545-0000-0010-8000-00aa006d2ea4)] enum CompareEnum +{ + adCompareLessThan = 0, + adCompareEqual = 1, + adCompareGreaterThan = 2, + adCompareNotEqual = 3, + adCompareNotComparable = 4 +} CompareEnum; + +typedef [uuid(00000523-0000-0010-8000-00aa006d2ea4)] enum IsolationLevelEnum +{ + adXactUnspecified = -1, + adXactChaos = 16, + adXactReadUncommitted = 256, + adXactBrowse = 256, + adXactCursorStability = 4096, + adXactReadCommitted = 4096, + adXactRepeatableRead = 65536, + adXactSerializable = 1048576, + adXactIsolated = 1048576 +} IsolationLevelEnum; + +typedef [uuid(00000521-0000-0010-8000-00aa006d2ea4)] enum ConnectModeEnum +{ + adModeUnknown = 0, + adModeRead = 1, + adModeWrite = 2, + adModeReadWrite = 3, + adModeShareDenyRead = 4, + adModeShareDenyWrite = 8, + adModeShareExclusive = 12, + adModeShareDenyNone = 16, + adModeRecursive = 4194304 +} ConnectModeEnum; + +typedef [uuid(00000533-0000-0010-8000-00aa006d2ea4)] enum SchemaEnum +{ + adSchemaProviderSpecific = -1, + adSchemaAsserts = 0, + adSchemaCatalogs = 1, + adSchemaCharacterSets = 2, + adSchemaCollations = 3, + adSchemaColumns = 4, + adSchemaCheckConstraints = 5, + adSchemaConstraintColumnUsage = 6, + adSchemaConstraintTableUsage = 7, + adSchemaKeyColumnUsage = 8, + adSchemaReferentialContraints = 9, + adSchemaReferentialConstraints = 9, + adSchemaTableConstraints = 10, + adSchemaColumnsDomainUsage = 11, + adSchemaIndexes = 12, + adSchemaColumnPrivileges = 13, + adSchemaTablePrivileges = 14, + adSchemaUsagePrivileges = 15, + adSchemaProcedures = 16, + adSchemaSchemata = 17, + adSchemaSQLLanguages = 18, + adSchemaStatistics = 19, + adSchemaTables = 20, + adSchemaTranslations = 21, + adSchemaProviderTypes = 22, + adSchemaViews = 23, + adSchemaViewColumnUsage = 24, + adSchemaViewTableUsage = 25, + adSchemaProcedureParameters = 26, + adSchemaForeignKeys = 27, + adSchemaPrimaryKeys = 28, + adSchemaProcedureColumns = 29, + adSchemaDBInfoKeywords = 30, + adSchemaDBInfoLiterals = 31, + adSchemaCubes = 32, + adSchemaDimensions = 33, + adSchemaHierarchies = 34, + adSchemaLevels = 35, + adSchemaMeasures = 36, + adSchemaProperties = 37, + adSchemaMembers = 38, + adSchemaTrustees = 39, + adSchemaFunctions = 40, + adSchemaActions = 41, + adSchemaCommands = 42, + adSchemaSets = 43 +} SchemaEnum; + +typedef [uuid(00000530-0000-0010-8000-00aa006d2ea4)] enum EventStatusEnum +{ + adStatusOK = 1, + adStatusErrorsOccurred = 2, + adStatusCantDeny = 3, + adStatusCancel = 4, + adStatusUnwantedEvent = 5 +} EventStatusEnum; + +typedef [uuid(0000052c-0000-0010-8000-00aa006d2ea4)] enum ParameterDirectionEnum +{ + adParamUnknown = 0, + adParamInput = 1, + adParamOutput = 2, + adParamInputOutput = 3, + adParamReturnValue = 4 +} ParameterDirectionEnum; + +typedef [uuid(0000052e-0000-0010-8000-00aa006d2ea4)] enum CommandTypeEnum +{ + adCmdUnspecified = -1, + adCmdUnknown = 8, + adCmdText = 1, + adCmdTable = 2, + adCmdStoredProc = 4, + adCmdFile = 256, + adCmdTableDirect = 512 +} CommandTypeEnum; + +typedef [uuid(00000532-0000-0010-8000-00aa006d2ea4)] enum ObjectStateEnum +{ + adStateClosed = 0, + adStateOpen = 1, + adStateConnecting = 2, + adStateExecuting = 4, + adStateFetching = 8 +} ObjectStateEnum; + +typedef [uuid(00000573-0000-0010-8000-00aa006d2ea4)] enum MoveRecordOptionsEnum +{ + adMoveUnspecified = -1, + adMoveOverWrite = 1, + adMoveDontUpdateLinks = 2, + adMoveAllowEmulation = 4 +} MoveRecordOptionsEnum; + +typedef [uuid(00000574-0000-0010-8000-00aa006d2ea4)] enum CopyRecordOptionsEnum +{ + adCopyUnspecified = -1, + adCopyOverWrite = 1, + adCopyAllowEmulation = 4, + adCopyNonRecursive = 2 +} CopyRecordOptionsEnum; + +typedef [uuid(00000570-0000-0010-8000-00aa006d2ea4)] enum RecordCreateOptionsEnum +{ + adCreateCollection = 0x00002000, + adCreateStructDoc = 0x80000000, + adCreateNonCollection = 0x00000000, + adOpenIfExists = 0x02000000, + adCreateOverwrite = 0x04000000, + adFailIfNotExists = -1 +} RecordCreateOptionsEnum; + +typedef [uuid(00000571-0000-0010-8000-00aa006d2ea4)] enum RecordOpenOptionsEnum +{ + adOpenRecordUnspecified = -1, + adOpenOutput = 0x00800000, + adOpenAsync = 0x00001000, + adDelayFetchStream = 0x00004000, + adDelayFetchFields = 0x00008000, + adOpenExecuteCommand = 0x00010000 +} RecordOpenOptionsEnum; + +typedef [uuid(0000057d-0000-0010-8000-00aa006d2ea4)] enum RecordTypeEnum +{ + adSimpleRecord = 0, + adCollectionRecord = 1, + adStructDoc = 2 +} RecordTypeEnum; + +typedef [uuid(00000576-0000-0010-8000-00aa006d2ea4)] enum StreamTypeEnum +{ + adTypeBinary = 1, + adTypeText = 2 +} StreamTypeEnum; + +typedef [uuid(00000577-0000-0010-8000-00aa006d2ea4)] enum LineSeparatorEnum +{ + adLF = 10, + adCR = 13, + adCRLF = -1 +} LineSeparatorEnum; + +typedef enum +{ + adReadAll = -1, + adReadLine = -2 +} StreamReadEnum; + +typedef [uuid(0000057c-0000-0010-8000-00aa006d2ea4)] enum SaveOptionsEnum +{ + adSaveCreateNotExist = 1, + adSaveCreateOverWrite = 2 +} SaveOptionsEnum; + +typedef [uuid(0000057a-0000-0010-8000-00aa006d2ea4)] enum StreamOpenOptionsEnum +{ + adOpenStreamUnspecified = -1, + adOpenStreamAsync = 1, + adOpenStreamFromRecord = 4 +} StreamOpenOptionsEnum; + +typedef [uuid(0000057b-0000-0010-8000-00aa006d2ea4)] enum StreamWriteEnum +{ + adWriteChar = 0, + adWriteLine = 1 +} StreamWriteEnum; + +typedef [uuid(00000531-0000-0010-8000-00aa006d2ea4)] enum EventReasonEnum +{ + adRsnAddNew = 1, + adRsnDelete = 2, + adRsnUpdate = 3, + adRsnUndoUpdate = 4, + adRsnUndoAddNew = 5, + adRsnUndoDelete = 6, + adRsnRequery = 7, + adRsnResynch = 8, + adRsnClose = 9, + adRsnMove = 10, + adRsnFirstChange = 11, + adRsnMoveFirst = 12, + adRsnMoveNext = 13, + adRsnMovePrevious = 14, + adRsnMoveLast = 15 +} EventReasonEnum; + +[ + uuid(00000503-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Property : IDispatch +{ + [id(00000000), propget] + HRESULT __stdcall Value( + [out, retval] VARIANT *val); + + [id(00000000), propput] + HRESULT __stdcall Value( + [in] VARIANT val); + + [id(0x60020002), propget] + HRESULT __stdcall Name( + [out, retval] BSTR *str); + + [id(0x60020003), propget] + HRESULT __stdcall Type( + [out, retval] DataTypeEnum *type); + + [id(0x60020004), propget] + HRESULT __stdcall Attributes( + [out, retval] LONG *attributes); + + [id(0x60020004), propput] + HRESULT __stdcall Attributes( + [in] LONG attributes); +}; + +[ + uuid(00000512-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _Collection : IDispatch +{ + [id(0x60020000), propget] + HRESULT __stdcall Count( + [out, retval] LONG *count); + + [id(0xfffffffc), restricted] + HRESULT __stdcall _NewEnum( + [out, retval] IUnknown **object); + + [id(0x60020002)] + HRESULT __stdcall Refresh(); +}; + +[ + uuid(00000504-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Properties : _Collection +{ + [id(00000000), propget] + HRESULT __stdcall Item( + [in] VARIANT index, + [out, retval] Property **object); +}; + +[ + uuid(00000534-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _ADO : IDispatch +{ + [id(0x000001f4), propget] + HRESULT __stdcall Properties( + [out, retval] Properties **object); +}; + +[ + uuid(0000054c-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation, + hidden +] +interface Field20 : _ADO +{ + [id(0x00000455), propget] + HRESULT __stdcall ActualSize( + [out, retval] LONG *size); + + [id(0x0000040c), propget] + HRESULT __stdcall Attributes( + [out, retval] LONG *attrs); + + [id(0x0000044f), propget] + HRESULT __stdcall DefinedSize( + [out, retval] LONG *size); + + [id(0x0000044c), propget] + HRESULT __stdcall Name( + [out, retval] BSTR *str); + + [id(0x0000044e), propget] + HRESULT __stdcall Type( + [out, retval] DataTypeEnum *type); + + [id(00000000), propget] + HRESULT __stdcall Value( + [out, retval] VARIANT *val); + + [id(00000000), propput] + HRESULT __stdcall Value( + [in] VARIANT val); + + [id(0x60030007), propget] + HRESULT __stdcall Precision( + [out, retval] unsigned char *precision); + + [id(0x60030008), propget] + HRESULT __stdcall NumericScale( + [out, retval] unsigned char *scale); + + [id(0x00000453)] + HRESULT __stdcall AppendChunk( + [in] VARIANT data); + + [id(0x00000454)] + HRESULT __stdcall GetChunk( + [in] LONG length, + [out, retval] VARIANT *var); + + [id(0x00000450), propget] + HRESULT __stdcall OriginalValue( + [out, retval] VARIANT *val); + + [id(0x00000451), propget] + HRESULT __stdcall UnderlyingValue( + [out, retval] VARIANT *val); + + [id(0x6003000d), propget] + HRESULT __stdcall DataFormat( + [out, retval] IUnknown **format); + + [id(0x6003000d), propputref] + HRESULT __stdcall DataFormat( + [in] IUnknown *format); + + [id(0x60030007), propput] + HRESULT __stdcall Precision( + [in] unsigned char precision); + + [id(0x60030008), propput] + HRESULT __stdcall NumericScale( + [in] unsigned char scale); + + [id(0x0000044e), propput] + HRESULT __stdcall Type( + [in] DataTypeEnum type); + + [id(0x0000044f), propput] + HRESULT __stdcall DefinedSize( + [in] LONG size); + + [id(0x0000040c), propput] + HRESULT __stdcall Attributes( + [in] LONG attrs); +}; + +[ + uuid(00000569-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Field : Field20 +{ + [id(0x0000045c), propget] + HRESULT __stdcall Status( + [out, retval] LONG *status); +}; + +[ + uuid(00000506-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Fields15 : _Collection +{ + [id(00000000), propget] + HRESULT __stdcall Item( + [in] VARIANT index, + [out, retval] Field **object); +}; + +[ + uuid(0000054d-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Fields20 : Fields15 +{ + [id(0x60030001)] + HRESULT __stdcall _Append( + [in] BSTR name, + [in] DataTypeEnum type, + [in, defaultvalue(0)] LONG size, + [in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr); + + [id(0x60030002)] + HRESULT __stdcall Delete( + [in] VARIANT index); +}; + +[ + uuid(00000564-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Fields : Fields20 +{ + [id(0x60040001)] + HRESULT __stdcall Append( + [in] BSTR name, + [in] DataTypeEnum type, + [in, defaultvalue(0)] LONG size, + [in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr, + [in, optional] VARIANT value); + + [id(0x60040002)] + HRESULT __stdcall Update(); + + [id(0x60040003)] + HRESULT __stdcall Resync( + [in, defaultvalue(adResyncAllValues)] ResyncEnum resync_values); + + [id(0x60040004)] + HRESULT __stdcall CancelUpdate(); +}; + +[ + uuid(0000050e-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Recordset15 : _ADO +{ + [id(0x000003e8), propget] + HRESULT __stdcall AbsolutePosition( + [out, retval] PositionEnum_Param *position); + + [id(0x000003e8), propput] + HRESULT __stdcall AbsolutePosition( + [in] PositionEnum_Param position); + + [id(0x000003e9), propputref] + HRESULT __stdcall ActiveConnection( + [in] IDispatch *connection); + + [id(0x000003e9), propput] + HRESULT __stdcall ActiveConnection( + [in] VARIANT connection); + + [id(0x000003e9), propget] + HRESULT __stdcall ActiveConnection( + [out, retval] VARIANT *connection); + + [id(0x000003ea), propget] + HRESULT __stdcall BOF( + [out, retval] VARIANT_BOOL *bof); + + [id(0x000003eb), propget] + HRESULT __stdcall Bookmark( + [out, retval] VARIANT *bookmark); + + [id(0x000003eb), propput] + HRESULT __stdcall Bookmark( + [in] VARIANT bookmark); + + [id(0x000003ec), propget] + HRESULT __stdcall CacheSize( + [out, retval] LONG *size); + + [id(0x000003ec), propput] + HRESULT __stdcall CacheSize( + [in] LONG size); + + [id(0x000003ed), propget] + HRESULT __stdcall CursorType( + [out, retval] CursorTypeEnum *cursor_type); + + [id(0x000003ed), propput] + HRESULT __stdcall CursorType( + [in] CursorTypeEnum cursor_type); + + [id(0x000003ee), propget] + HRESULT __stdcall EOF( + [out, retval] VARIANT_BOOL *eof); + + [id(00000000), propget] + HRESULT __stdcall Fields( + [out, retval] Fields **object); + + [id(0x000003f0), propget] + HRESULT __stdcall LockType( + [out, retval] LockTypeEnum *lock_type); + + [id(0x000003f0), propput] + HRESULT __stdcall LockType( + [in] LockTypeEnum lock_type); + + [id(0x000003f1), propget] + HRESULT __stdcall MaxRecords( + [out, retval] LONG *max_records); + + [id(0x000003f1), propput] + HRESULT __stdcall MaxRecords( + [in] LONG max_records); + + [id(0x000003f2), propget] + HRESULT __stdcall RecordCount( + [out, retval] LONG *count); + + [id(0x000003f3), propputref] + HRESULT __stdcall Source( + [in] IDispatch *source); + + [id(0x000003f3), propput] + HRESULT __stdcall Source( + [in] BSTR source); + + [id(0x000003f3), propget] + HRESULT __stdcall Source( + [out, retval] VARIANT *source); + + [id(0x000003f4)] + HRESULT __stdcall AddNew( + [in, optional] VARIANT field_list, + [in, optional] VARIANT values); + + [id(0x000003f5)] + HRESULT __stdcall CancelUpdate(); + + [id(0x000003f6)] + HRESULT __stdcall Close(); + + [id(0x000003f7)] + HRESULT __stdcall Delete( + [in, defaultvalue(adAffectCurrent)] AffectEnum affect_records); + + [id(0x000003f8)] + HRESULT __stdcall GetRows( + [in, defaultvalue(-1)] LONG rows, + [in, optional] VARIANT start, + [in, optional] VARIANT fields, + [out, retval] VARIANT *var); + + [id(0x000003f9)] + HRESULT __stdcall Move( + [in] LONG num_records, + [in, optional] VARIANT start); + + [id(0x000003fa)] + HRESULT __stdcall MoveNext(); + + [id(0x000003fb)] + HRESULT __stdcall MovePrevious(); + + [id(0x000003fc)] + HRESULT __stdcall MoveFirst(); + + [id(0x000003fd)] + HRESULT __stdcall MoveLast(); + + [id(0x000003fe)] + HRESULT __stdcall Open( + [in, optional] VARIANT source, + [in, optional] VARIANT active_connection, + [in, defaultvalue(adOpenUnspecified)] CursorTypeEnum cursor_type, + [in, defaultvalue(adLockUnspecified)] LockTypeEnum lock_type, + [in, defaultvalue(-1)] LONG options); + + [id(0x000003ff)] + HRESULT __stdcall Requery( + [in, defaultvalue(-1)] LONG options); + + [id(0x60030022), hidden] + HRESULT __stdcall _xResync( + [in, defaultvalue(adAffectAll)] AffectEnum affect_records); + + [id(0x00000401)] + HRESULT __stdcall Update( + [in, optional] VARIANT fields, + [in, optional] VARIANT values); + + [id(0x00000417), propget] + HRESULT __stdcall AbsolutePage( + [out, retval] PositionEnum_Param *position); + + [id(0x00000417), propput] + HRESULT __stdcall AbsolutePage( + [in] PositionEnum_Param position); + + [id(0x00000402), propget] + HRESULT __stdcall EditMode( + [out, retval] EditModeEnum *mode); + + [id(0x00000406), propget] + HRESULT __stdcall Filter( + [out, retval] VARIANT *criteria); + + [id(0x00000406), propput] + HRESULT __stdcall Filter( + [in] VARIANT criteria); + + [id(0x0000041a), propget] + HRESULT __stdcall PageCount( + [out, retval] LONG *count); + + [id(0x00000418), propget] + HRESULT __stdcall PageSize( + [out, retval] LONG *size); + + [id(0x00000418), propput] + HRESULT __stdcall PageSize( + [in] LONG size); + + [id(0x00000407), propget] + HRESULT __stdcall Sort( + [out, retval] BSTR *criteria); + + [id(0x00000407), propput] + HRESULT __stdcall Sort( + [in] BSTR criteria); + + [id(0x00000405), propget] + HRESULT __stdcall Status( + [out, retval] LONG *status); + + [id(0x0000041e), propget] + HRESULT __stdcall State( + [out, retval] LONG *state); + + [id(0x60030030), hidden] + HRESULT __stdcall _xClone( + [out, retval] _Recordset **object); + + [id(0x0000040b)] + HRESULT __stdcall UpdateBatch( + [in, defaultvalue(adAffectAll)] AffectEnum affect_records); + + [id(0x00000419)] + HRESULT __stdcall CancelBatch( + [in, defaultvalue(adAffectAll)] AffectEnum affect_records); + + [id(0x0000041b), propget] + HRESULT __stdcall CursorLocation( + [out, retval] CursorLocationEnum *cursor_loc); + + [id(0x0000041b), propput] + HRESULT __stdcall CursorLocation( + [in] CursorLocationEnum cursor_loc); + + [id(0x0000041c)] + HRESULT __stdcall NextRecordset( + [out, optional] VARIANT *records_affected, + [out, retval] _Recordset **record_set); + + [id(0x0000040c)] + HRESULT __stdcall Supports( + [in] CursorOptionEnum cursor_options, + [out, retval] VARIANT_BOOL *ret); + + [id(0xfffffff8), propget, hidden] + HRESULT __stdcall Collect( + [in] VARIANT index, + [out, retval] VARIANT *var); + + [id(0xfffffff8), propput, hidden] + HRESULT __stdcall Collect( + [in] VARIANT index, + [in] VARIANT var); + + [id(0x0000041d), propget] + HRESULT __stdcall MarshalOptions( + [out, retval] MarshalOptionsEnum *options); + + [id(0x0000041d), propput] + HRESULT __stdcall MarshalOptions( + [in] MarshalOptionsEnum options); + + [id(0x00000422)] + HRESULT __stdcall Find( + [in] BSTR criteria, + [in, defaultvalue(0)] LONG skip_records, + [in, defaultvalue(adSearchForward)] SearchDirectionEnum search_direction, + [in, optional] VARIANT start); +}; + +[ + uuid(0000054f-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Recordset20 : Recordset15 +{ + [id(0x0000041f)] + HRESULT __stdcall Cancel(); + + [id(0x00000420), propget] + HRESULT __stdcall DataSource( + [out, retval] IUnknown **data_source); + + [id(0x00000420), propputref] + HRESULT __stdcall DataSource( + [in] IUnknown *data_source); + + [hidden] + HRESULT __stdcall _xSave( + [in, optional] BSTR filename, + [in, defaultvalue(adPersistADTG)] PersistFormatEnum persist_format); + + [id(0x00000425), propget] + HRESULT __stdcall ActiveCommand( + [out, retval] IDispatch **cmd); + + [id(0x00000427), propput] + HRESULT __stdcall StayInSync( + [in] VARIANT_BOOL stay_in_sync); + + [id(0x00000427), propget] + HRESULT __stdcall StayInSync( + [out, retval] VARIANT_BOOL *stay_in_sync); + + [id(0x00000426)] + HRESULT __stdcall GetString( + [in, defaultvalue(adClipString)] StringFormatEnum string_format, + [in, defaultvalue(-1)] LONG num_rows, + [in, optional] BSTR column_delimeter, + [in, optional] BSTR row_delimeter, + [in, optional] BSTR null_expr, + [out, retval] BSTR *ret_string); + + [id(0x00000428), propget] + HRESULT __stdcall DataMember( + [out, retval] BSTR *data_member); + + [id(0x00000428), propput] + HRESULT __stdcall DataMember( + [in] BSTR data_member); + + [id(0x00000429)] + HRESULT __stdcall CompareBookmarks( + [in] VARIANT bookmark1, + [in] VARIANT bookmark2, + [out, retval] CompareEnum *compare); + + [id(0x0000040a)] + HRESULT __stdcall Clone( + [in, defaultvalue(adLockUnspecified)] LockTypeEnum lock_type, + [out, retval] _Recordset **object); + + [id(0x00000400)] + HRESULT __stdcall Resync( + [in, defaultvalue(adAffectAll)] AffectEnum affect_records, + [in, defaultvalue(adResyncAllValues)] ResyncEnum resync_values); +}; + +[ + uuid(00000555-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Recordset21 : Recordset20 +{ + [id(0x0000042a)] + HRESULT __stdcall Seek( + [in] VARIANT key_values, + [in, defaultvalue(adSeekFirstEQ)] SeekEnum seek_option); + + [id(0x0000042b), propput] + HRESULT __stdcall Index( + [in] BSTR index); + + [id(0x0000042b), propget] + HRESULT __stdcall Index( + [out, retval] BSTR *index); +}; + +[ + uuid(00000556-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _Recordset : Recordset21 +{ + [id(0x00000421)] + HRESULT Save( + [in, optional] VARIANT destination, + [in, defaultvalue(adPersistADTG)] PersistFormatEnum persist_format); +}; + +[ + uuid(00000500-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Error : IDispatch +{ + [id(0x60020000), propget] + HRESULT __stdcall Number( + [out, retval] LONG *number); + + [id(0x60020001), propget] + HRESULT __stdcall Source( + [out, retval] BSTR *str); + + [id(00000000), propget] + HRESULT __stdcall Description( + [out, retval] BSTR *str); + + [id(0x60020003), propget] + HRESULT __stdcall HelpFile( + [out, retval] BSTR *str); + + [id(0x60020004), propget] + HRESULT __stdcall HelpContext( + [out, retval] LONG *ctx); + + [id(0x60020005), propget] + HRESULT __stdcall SQLState( + [out, retval] BSTR *str); + + [id(0x60020006), propget] + HRESULT __stdcall NativeError( + [out, retval] LONG *error); +}; + +[ + uuid(00000501-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Errors : _Collection +{ + [id(00000000), propget] + HRESULT __stdcall Item( + [in] VARIANT index, + [out, retval] Error **object); + + [id(0x60030001)] + HRESULT __stdcall Clear(); +}; + +[ + uuid(00000515-0000-0010-8000-00aa006d2ea4), + odl, + dual, + oleautomation +] +interface Connection15 : _ADO +{ + [id(00000000), propget] + HRESULT __stdcall ConnectionString( + [out, retval] BSTR *str); + + [id(00000000), propput] + HRESULT __stdcall ConnectionString( + [in] BSTR str); + + [id(0x00000002), propget] + HRESULT __stdcall CommandTimeout( + [out, retval] LONG *timeout); + + [id(0x00000002), propput] + HRESULT __stdcall CommandTimeout( + [in] LONG timeout); + + [id(0x00000003), propget] + HRESULT __stdcall ConnectionTimeout( + [out, retval] LONG *timeout); + + [id(0x00000003), propput] + HRESULT __stdcall ConnectionTimeout( + [in] LONG timeout); + + [id(0x00000004), propget] + HRESULT __stdcall Version( + [out, retval] BSTR *str); + + [id(0x00000005)] + HRESULT __stdcall Close(); + + [id(0x00000006)] + HRESULT __stdcall Execute( + [in] BSTR command, + [out, optional] VARIANT *records_affected, + [in, defaultvalue(-1)] LONG options, + [out, retval] _Recordset **record_set); + + [id(0x00000007)] + HRESULT __stdcall BeginTrans( + [out, retval] LONG *transaction_level); + + [id(0x00000008)] + HRESULT __stdcall CommitTrans(); + + [id(0x00000009)] + HRESULT __stdcall RollbackTrans(); + + [id(0x0000000a)] + HRESULT __stdcall Open( + [in, defaultvalue("")] BSTR connection_str, + [in, defaultvalue("")] BSTR user_id, + [in, defaultvalue("")] BSTR password, + [in, defaultvalue(-1)] LONG options); + + [id(0x0000000b), propget] + HRESULT __stdcall Errors( + [out, retval] Errors **object); + + [id(0x0000000c), propget] + HRESULT __stdcall DefaultDatabase( + [out, retval] BSTR *str); + + [id(0x0000000c), propput] + HRESULT __stdcall DefaultDatabase( + [in] BSTR str); + + [id(0x0000000d), propget] + HRESULT __stdcall IsolationLevel( + [out, retval] IsolationLevelEnum *level); + + [id(0x0000000d), propput] + HRESULT __stdcall IsolationLevel( + [in] IsolationLevelEnum level); + + [id(0x0000000e), propget] + HRESULT __stdcall Attributes( + [out, retval] LONG *attr); + + [id(0x0000000e), propput] + HRESULT __stdcall Attributes( + [in] LONG attr); + + [id(0x0000000f), propget] + HRESULT __stdcall CursorLocation( + [out, retval] CursorLocationEnum *cursor_loc); + + [id(0x0000000f), propput] + HRESULT __stdcall CursorLocation( + [in] CursorLocationEnum cursor_loc); + + [id(0x00000010), propget] + HRESULT __stdcall Mode( + [out, retval] ConnectModeEnum *mode); + + [id(0x00000010), propput] + HRESULT __stdcall Mode( + [in] ConnectModeEnum mode); + + [id(0x00000011), propget] + HRESULT __stdcall Provider( + [out, retval] BSTR *str); + + [id(0x00000011), propput] + HRESULT __stdcall Provider( + [in] BSTR str); + + [id(0x00000012), propget] + HRESULT __stdcall State( + [out, retval] LONG *state); + + [id(0x00000013)] + HRESULT __stdcall OpenSchema( + [in] SchemaEnum schema, + [in, optional] VARIANT restrictions, + [in, optional] VARIANT schema_id, + [out, retval] _Recordset **record_set); +}; + +[ + uuid(00000550-0000-0010-8000-00aa006d2ea4), + odl, + dual, + oleautomation +] +interface _Connection : Connection15 +{ + [id(0x00000015)] + HRESULT __stdcall Cancel(); +}; + +[ + uuid(0000050c-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _Parameter : _ADO +{ + [id(0x60030000), propget] + HRESULT __stdcall Name( + [out, retval] BSTR *str); + + [id(0x60030000), propput] + HRESULT __stdcall Name( + [in] BSTR str); + + [id(00000000), propget] + HRESULT __stdcall Value( + [out, retval] VARIANT *val); + + [id(00000000), propput] + HRESULT __stdcall Value( + [in] VARIANT val); + + [id(0x60030004), propget] + HRESULT __stdcall Type( + [out, retval] DataTypeEnum *data_type); + + [id(0x60030004), propput] + HRESULT __stdcall Type( + [in] DataTypeEnum data_type); + + [id(0x60030006), propput] + HRESULT __stdcall Direction( + [in] ParameterDirectionEnum direction); + + [id(0x60030006), propget] + HRESULT __stdcall Direction( + [out, retval] ParameterDirectionEnum *direction); + + [id(0x60030008), propput] + HRESULT __stdcall Precision( + [in] unsigned char precision); + + [id(0x60030008), propget] + HRESULT __stdcall Precision( + [out, retval] unsigned char *precision); + + [id(0x6003000a), propput] + HRESULT __stdcall NumericScale( + [in] unsigned char scale); + + [id(0x6003000a), propget] + HRESULT __stdcall NumericScale( + [out, retval] unsigned char *scale); + + [id(0x6003000c), propput] + HRESULT __stdcall Size( + [in] LONG size); + + [id(0x6003000c), propget] + HRESULT __stdcall Size( + [out, retval] LONG *size); + + [id(0x6003000e)] + HRESULT __stdcall AppendChunk( + [in] VARIANT val); + + [id(0x6003000f), propget] + HRESULT __stdcall Attributes( + [out, retval] LONG *attrs); + + [id(0x6003000f), propput] + HRESULT __stdcall Attributes( + [in] LONG attrs); +}; + +[ + uuid(00000513-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _DynaCollection : _Collection +{ + [id(0x60030000)] + HRESULT __stdcall Append( + [in] IDispatch *object); + + [id(0x60030001)] + HRESULT __stdcall Delete( + [in] VARIANT index); +}; + +[ + uuid(0000050d-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Parameters : _DynaCollection +{ + [id(00000000), propget] + HRESULT __stdcall Item( + [in] VARIANT index, + [out, retval] _Parameter **object); +}; + +[ + uuid(00000508-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Command15 : _ADO +{ + [id(0x60030000), propget] + HRESULT __stdcall ActiveConnection( + [out, retval] _Connection **object); + + [id(0x60030000), propputref] + HRESULT __stdcall ActiveConnection( + [in] _Connection *object); + + [id(0x60030000), propput] + HRESULT __stdcall ActiveConnection( + [in] VARIANT object); + + [id(0x60030003), propget] + HRESULT __stdcall CommandText( + [out, retval] BSTR *str); + + [id(0x60030003), propput] + HRESULT __stdcall CommandText( + [in] BSTR str); + + [id(0x60030005), propget] + HRESULT __stdcall CommandTimeout( + [out, retval] LONG *timeout); + + [id(0x60030005), propput] + HRESULT __stdcall CommandTimeout( + [in] LONG timeout); + + [id(0x60030007), propget] + HRESULT __stdcall Prepared( + [out, retval] VARIANT_BOOL *prepared); + + [id(0x60030007), propput] + HRESULT __stdcall Prepared( + [in] VARIANT_BOOL prepared); + + [id(0x60030009)] + HRESULT __stdcall Execute( + [out, optional] VARIANT *records_affected, + [in, optional] VARIANT *parameters, + [in, defaultvalue(-1)] LONG options, + [out, retval] _Recordset **record_set); + + [id(0x6003000a)] + HRESULT __stdcall CreateParameter( + [in, defaultvalue("")] BSTR name, + [in, defaultvalue(adEmpty)] DataTypeEnum type, + [in, defaultvalue(adParamInput)] ParameterDirectionEnum direction, + [in, defaultvalue(0)] LONG size, + [in, optional] VARIANT value, + [out, retval] _Parameter **parameter); + + [id(00000000), propget] + HRESULT __stdcall Parameters( + [out, retval] Parameters **object); + + [id(0x6003000c), propput] + HRESULT __stdcall CommandType( + [in] CommandTypeEnum cmd_type); + + [id(0x6003000c), propget] + HRESULT __stdcall CommandType( + [out, retval] CommandTypeEnum *cmd_type); + + [id(0x6003000e), propget] + HRESULT __stdcall Name( + [out, retval] BSTR *name); + + [id(0x6003000e), propput] + HRESULT __stdcall Name( + [in] BSTR name); +}; + +[ + uuid(0000054e-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface Command25 : Command15 +{ + [id(0x60030010), propget] + HRESULT __stdcall State( + [out, retval] LONG *state); + + [id(0x60030011)] + HRESULT __stdcall Cancel(); +}; + +[ + uuid(b08400bd-f9d1-4d02-b856-71d5dba123e9), + odl, + dual, + nonextensible, + oleautomation +] +interface _Command : Command25 +{ + [id(0x60030012), propputref] + HRESULT __stdcall CommandStream( + [in] IUnknown *stream); + + [id(0x60030012), propget] + HRESULT __stdcall CommandStream( + [out, retval] VARIANT *stream); + + [id(0x60030013), propput] + HRESULT __stdcall Dialect( + [in] BSTR dialect); + + [id(0x60030013), propget] + HRESULT __stdcall Dialect( + [out, retval] BSTR *dialect); + + [id(0x60030014), propput] + HRESULT __stdcall NamedParameters( + [in] VARIANT_BOOL named_parameters); + + [id(0x60030014), propget] + HRESULT __stdcall NamedParameters( + [out, retval] VARIANT_BOOL *named_parameters); +}; + +[ + uuid(00000400-0000-0010-8000-00aa006d2ea4) +] +dispinterface ConnectionEvents +{ + properties: + methods: + [id(00000000)] + HRESULT InfoMessage( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *Connection); + + [id(0x00000001)] + HRESULT BeginTransComplete( + [in] LONG TransactionLevel, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + [id(0x00000003)] + HRESULT CommitTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + [id(0x00000002)] + HRESULT RollbackTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + [id(0x00000004)] + HRESULT WillExecute( + [in, out] BSTR *source, + [in, out] CursorTypeEnum *cursor_type, + [in, out] LockTypeEnum *lock_type, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + [id(0x00000005)] + HRESULT ExecuteComplete( + [in] LONG records_affected, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + [id(0x00000006)] + HRESULT WillConnect( + [in, out] BSTR *string, + [in, out] BSTR *userid, + [in, out] BSTR *password, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + [id(0x00000007)] + HRESULT ConnectComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + [id(0x00000008)] + HRESULT Disconnect( + [in, out] EventStatusEnum *status, + [in] _Connection *connection); +}; + +[ + uuid(00000562-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _Record : _ADO +{ + [id(1), propget] + HRESULT __stdcall ActiveConnection( + [out, retval] VARIANT *connection); + + [id(1), propput] + HRESULT __stdcall ActiveConnection( + [in] BSTR connection); + + [id(1), propputref] + HRESULT ActiveConnection( + [in] _Connection *connection); + + [id(2), propget] + HRESULT __stdcall State( + [out, retval] ObjectStateEnum *state); + + [id(3), propget] + HRESULT __stdcall Source( + [out, retval] VARIANT *source); + + [id(3), propput] + HRESULT __stdcall Source( + [in] BSTR source); + + [id(3), propputref] + HRESULT __stdcall Source( + [in] IDispatch *source); + + [id(4), propget] + HRESULT __stdcall Mode( + [out, retval] ConnectModeEnum *mode); + + [id(4), propput] + HRESULT __stdcall Mode( + [in] ConnectModeEnum mode); + + [id(5), propget] + HRESULT __stdcall ParentURL( + [out, retval] BSTR *parent_URL); + + [id(6)] + HRESULT __stdcall MoveRecord( + [in, defaultvalue("")] BSTR source, + [in, defaultvalue("")] BSTR Destination, + [in, optional] BSTR UserName, + [in, optional] BSTR Password, + [in, defaultvalue(adMoveUnspecified)] MoveRecordOptionsEnum Options, + [in, optional] VARIANT_BOOL Async, + [out, retval] BSTR *pbstrNewURL); + + [id(7)] + HRESULT __stdcall CopyRecord( + [in, defaultvalue("")] BSTR source, + [in, defaultvalue("")] BSTR destination, + [in, optional] BSTR username, + [in, optional] BSTR password, + [in, defaultvalue(adCopyUnspecified)] CopyRecordOptionsEnum options, + [in, optional] VARIANT_BOOL async, + [out, retval] BSTR *new_URL); + + [id(8)] + HRESULT __stdcall DeleteRecord( + [in] BSTR source, + [in, optional] VARIANT_BOOL async); + + [id(9)] + HRESULT __stdcall Open( + [in, optional] VARIANT source, + [in, optional] VARIANT active_connection, + [in, optional] ConnectModeEnum mode, + [in, defaultvalue(adFailIfNotExists)] RecordCreateOptionsEnum create_options, + [in, defaultvalue(adOpenRecordUnspecified)] RecordOpenOptionsEnum options, + [in, optional] BSTR username, + [in, optional] BSTR password); + + [id(10)] + HRESULT __stdcall Close(); + + [id(0), propget] + HRESULT __stdcall Fields( + [out, retval] Fields **fields); + + [id(11), propget] + HRESULT __stdcall RecordType( + [out, retval] RecordTypeEnum *type); + + [id(12)] + HRESULT __stdcall GetChildren( + [out, retval] _Recordset **record_set); + + [id(13)] + HRESULT __stdcall Cancel(); +}; + +[ + uuid(00000565-0000-0010-8000-00aa006d2ea4), + odl, + dual, + nonextensible, + oleautomation +] +interface _Stream : IDispatch +{ + [id(1), propget] + HRESULT __stdcall Size( + [out, retval] LONG *size); + + [id(2), propget] + HRESULT __stdcall EOS( + [out, retval] VARIANT_BOOL *eos); + + [id(3), propget] + HRESULT __stdcall Position( + [out, retval] LONG *position); + + [id(3), propput] + HRESULT __stdcall Position( + [in] LONG position); + + [id(4), propget] + HRESULT __stdcall Type( + [out, retval] StreamTypeEnum *type); + + [id(4), propput] + HRESULT __stdcall Type( + [in] StreamTypeEnum type); + + [id(5), propget] + HRESULT __stdcall LineSeparator( + [out, retval] LineSeparatorEnum *separator); + + [id(5), propput] + HRESULT __stdcall LineSeparator( + [in] LineSeparatorEnum separator); + + [id(6), propget] + HRESULT __stdcall State( + [out, retval] ObjectStateEnum *state); + + [id(7), propget] + HRESULT __stdcall Mode( + [out, retval] ConnectModeEnum *mode); + + [id(7), propput] + HRESULT __stdcall Mode( + [in] ConnectModeEnum mode); + + [id(8), propget] + HRESULT Charset( + [out, retval] BSTR *charset); + + [id(8), propput] + HRESULT Charset( + [in] BSTR charset); + + [id(9)] + HRESULT __stdcall Read( + [in, defaultvalue(adReadAll)] LONG num_bytes, + [out, retval] VARIANT *val); + + [id(10)] + HRESULT __stdcall Open( + [in, optional] VARIANT source, + [in, defaultvalue(adModeUnknown)] ConnectModeEnum mode, + [in, defaultvalue(adOpenStreamUnspecified)] StreamOpenOptionsEnum options, + [in, optional] BSTR username, + [in, optional] BSTR password); + + [id(11)] + HRESULT __stdcall Close(void); + + [id(12)] + HRESULT __stdcall SkipLine(void); + + [id(13)] + HRESULT __stdcall Write( + [in] VARIANT buffer); + + [id(14)] + HRESULT __stdcall SetEOS(void); + + [id(15)] + HRESULT __stdcall CopyTo( + [in] _Stream *dest, + [in, defaultvalue(-1)] LONG size); + + [id(16)] + HRESULT __stdcall Flush(void); + + [id(17)] + HRESULT __stdcall SaveToFile( + [in] BSTR FileName, + [in, defaultvalue(adSaveCreateNotExist)] SaveOptionsEnum options); + + [id(18)] + HRESULT __stdcall LoadFromFile( + [in] BSTR filename); + + [id(19)] + HRESULT __stdcall ReadText( + [in, defaultvalue(adReadAll)] LONG size, + [out, retval] BSTR *str); + + [id(20)] + HRESULT __stdcall WriteText( + [in] BSTR data, + [in, defaultvalue(adWriteChar)] StreamWriteEnum options); + + [id(21)] + HRESULT __stdcall Cancel(void); +}; + +[ + uuid(00000266-0000-0010-8000-00aa006d2ea4) +] +dispinterface RecordsetEvents +{ + properties: + methods: + [id(0x00000009)] + HRESULT WillChangeField( + [in] LONG count, + [in] VARIANT fields, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000a)] + HRESULT FieldChangeComplete( + [in] LONG count, + [in] VARIANT fields, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000b)] + HRESULT WillChangeRecord( + [in] EventReasonEnum reason, + [in] LONG count, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000c)] + HRESULT RecordChangeComplete( + [in] EventReasonEnum reason, + [in] LONG count, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000d)] + HRESULT WillChangeRecordset( + [in] EventReasonEnum reason, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000e)] + HRESULT RecordsetChangeComplete( + [in] EventReasonEnum reason, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x0000000f)] + HRESULT WillMove( + [in] EventReasonEnum reason, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x00000010)] + HRESULT MoveComplete( + [in] EventReasonEnum reason, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x00000011)] + HRESULT EndOfRecordset( + [in, out] VARIANT_BOOL *more_data, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x00000012)] + HRESULT FetchProgress( + [in] LONG progress, + [in] LONG max_progress, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); + + [id(0x00000013)] + HRESULT FetchComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Recordset *record_set); +}; + +[ + uuid(00000538-0000-0010-8000-00aa006d2ea4), + odl, + hidden +] +interface ADODebugging : IUnknown +{ + HRESULT __stdcall IsGlobalDebugMode( + VARIANT_BOOL *debugging_on); + + HRESULT __stdcall SetGlobalDebugMode( + IUnknown *debugger, + VARIANT_BOOL debugging_on); +}; + +[ + uuid(00000516-0000-0010-8000-00aa006d2ea4), + odl, + restricted +] +interface ADOConnectionConstruction15 : IUnknown +{ + [propget] + HRESULT __stdcall DSO( + [out, retval] IUnknown **dso); + + [propget] + HRESULT __stdcall Session( + [out, retval] IUnknown **session); + + HRESULT __stdcall WrapDSOandSession( + [in] IUnknown *dso, + [in] IUnknown *session); +}; + +[ + uuid(00000551-0000-0010-8000-00aa006d2ea4), + odl, + restricted +] +interface ADOConnectionConstruction : ADOConnectionConstruction15 +{ +}; + +[ + uuid(00000517-0000-0010-8000-00aa006d2ea4), + odl, + restricted +] +interface ADOCommandConstruction : IUnknown +{ + [propget] + HRESULT __stdcall OLEDBCommand( + [out, retval] IUnknown **command); + + [propput] + HRESULT __stdcall OLEDBCommand( + [in] IUnknown *command); +}; + +[ + uuid(00000283-0000-0010-8000-00aa006d2ea4), + odl, + restricted +] +interface ADORecordsetConstruction : IDispatch +{ + [propget] + HRESULT __stdcall Rowset( + [out, retval] IUnknown **row_set); + + [propput] + HRESULT __stdcall Rowset( + [in] IUnknown *row_set); + + [propget] + HRESULT __stdcall Chapter( + [out, retval] LONG *chapter); + + [propput] + HRESULT __stdcall Chapter( + [in] LONG chapter); + + [propget] + HRESULT __stdcall RowPosition( + [out, retval] IUnknown **row_pos); + + [propput] + HRESULT __stdcall RowPosition( + [in] IUnknown *row_pos); +}; + +[ + uuid(2a75196c-d9eb-4129-b803-931327f72d5c), + version(2.8) +] +library ADODB +{ + importlib("stdole2.tlb"); + + [ + uuid(00000514-0000-0010-8000-00aa006d2ea4), + ] + coclass Connection + { + [default] interface _Connection; + [default, source] dispinterface ConnectionEvents; + }; + + [ + uuid(00000507-0000-0010-8000-00aa006d2ea4), + ] + coclass Command + { + [default] interface _Command; + }; + + [ + uuid(00000535-0000-0010-8000-00aa006d2ea4), + ] + coclass Recordset + { + [default] interface _Recordset; + [default, source] dispinterface RecordsetEvents; + }; + + [ + uuid(0000050b-0000-0010-8000-00aa006d2ea4), + ] + coclass Parameter + { + [default] interface _Parameter; + }; + + [ + uuid(00000560-0000-0010-8000-00aa006d2ea4), + ] + coclass Record + { + [default] interface _Record; + }; + + [ + uuid(00000566-0000-0010-8000-00aa006d2ea4), + ] + coclass Stream + { + [default] interface _Stream; + }; +} -- 2.20.1

2 1

[PATCH 4/5] msado15: Add a stub _Stream implementation.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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(-) create mode 100644 dlls/msado15/stream.c diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 5b255df323..604f9ff018 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -6,7 +6,8 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ connection.c \ main.c \ - recordset.c + recordset.c \ + stream.c IDL_SRCS = \ msado15_classes.idl \ diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 321ba40e3b..32ae252337 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -119,6 +119,7 @@ static const struct IClassFactoryVtbl msadocf_vtbl = static struct msadocf connection_cf = { { &msadocf_vtbl }, Connection_create }; static struct msadocf recordset_cf = { { &msadocf_vtbl }, Recordset_create }; +static struct msadocf stream_cf = { { &msadocf_vtbl }, Stream_create }; /*********************************************************************** * DllGetClassObject @@ -137,6 +138,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) { cf = &recordset_cf.IClassFactory_iface; } + else if (IsEqualGUID( clsid, &CLSID_Stream )) + { + cf = &stream_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, obj ); } diff --git a/dlls/msado15/msado15_classes.idl b/dlls/msado15/msado15_classes.idl index 56e86a0dc6..5ede180240 100644 --- a/dlls/msado15/msado15_classes.idl +++ b/dlls/msado15/msado15_classes.idl @@ -33,3 +33,11 @@ coclass Connection { interface _Connection; } uuid(00000535-0000-0010-8000-00aa006d2ea4) ] coclass Recordset { interface _Recordset; } + +[ + threading(both), + progid("ADODB.Stream.6.0"), + vi_progid("ADODB.Stream"), + uuid(00000566-0000-0010-8000-00aa006d2ea4) +] +coclass Stream { interface _Stream; } diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 1f8948522b..83c8b7c966 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -21,5 +21,6 @@ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; +HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; #endif /* _WINE_MSADO15_PRIVATE_H_ */ diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c new file mode 100644 index 0000000000..48a485d599 --- /dev/null +++ b/dlls/msado15/stream.c @@ -0,0 +1,312 @@ +/* + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "msado15_backcompat.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado15); + +struct stream +{ + _Stream Stream_iface; + LONG refs; +}; + +static inline struct stream *impl_from_Stream( _Stream *iface ) +{ + return CONTAINING_RECORD( iface, struct stream, Stream_iface ); +} + +static ULONG WINAPI stream_AddRef( _Stream *iface ) +{ + struct stream *stream = impl_from_Stream( iface ); + return InterlockedIncrement( &stream->refs ); +} + +static ULONG WINAPI stream_Release( _Stream *iface ) +{ + struct stream *stream = impl_from_Stream( iface ); + LONG refs = InterlockedDecrement( &stream->refs ); + if (!refs) + { + TRACE( "destroying %p\n", stream ); + heap_free( stream ); + } + return refs; +} + +static HRESULT WINAPI stream_QueryInterface( _Stream *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID__Stream ) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + stream_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI stream_GetTypeInfoCount( _Stream *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_GetTypeInfo( _Stream *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_GetIDsOfNames( _Stream *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) +{ + FIXME( "%p, %p\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) +{ + FIXME( "%p, %p\n", iface, eos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) +{ + FIXME( "%p, %p\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_put_Position( _Stream *iface, LONG pos ) +{ + FIXME( "%p, %d\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_Type( _Stream *iface, StreamTypeEnum *type ) +{ + FIXME( "%p, %p\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_put_Type( _Stream *iface, StreamTypeEnum type ) +{ + FIXME( "%p, %u\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_LineSeparator( _Stream *iface, LineSeparatorEnum *sep ) +{ + FIXME( "%p, %p\n", iface, sep ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_put_LineSeparator( _Stream *iface, LineSeparatorEnum sep ) +{ + FIXME( "%p, %d\n", iface, sep ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_State( _Stream *iface, ObjectStateEnum *state ) +{ + FIXME( "%p, %p\n", iface, state ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_Mode( _Stream *iface, ConnectModeEnum *mode ) +{ + FIXME( "%p, %p\n", iface, mode ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_put_Mode( _Stream *iface, ConnectModeEnum mode ) +{ + FIXME( "%p, %u\n", iface, mode ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_get_Charset( _Stream *iface, BSTR *charset ) +{ + FIXME( "%p, %p\n", iface, charset ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_put_Charset( _Stream *iface, BSTR charset ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(charset) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Read( _Stream *iface, LONG size, VARIANT *val ) +{ + FIXME( "%p, %d, %p\n", iface, size, val ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Open( _Stream *iface, VARIANT src, ConnectModeEnum mode, StreamOpenOptionsEnum options, + BSTR username, BSTR password ) +{ + FIXME( "%p, %s, %u, %d, %s, %p\n", iface, debugstr_variant(&src), mode, options, debugstr_w(username), password ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Close( _Stream *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_SkipLine( _Stream *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Write( _Stream *iface, VARIANT buf ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&buf) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_SetEOS( _Stream *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, LONG size ) +{ + FIXME( "%p, %p, %d\n", iface, dst, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Flush( _Stream *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_SaveToFile( _Stream *iface, BSTR filename, SaveOptionsEnum options ) +{ + FIXME( "%p, %s, %u\n", iface, debugstr_w(filename), options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_LoadFromFile( _Stream *iface, BSTR filename ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(filename) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret ) +{ + FIXME( "%p, %d, %p\n", iface, len, ret ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_WriteText( _Stream *iface, BSTR data, StreamWriteEnum options ) +{ + FIXME( "%p, %p, %u\n", iface, debugstr_w(data), options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Cancel( _Stream *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static const struct _StreamVtbl stream_vtbl = +{ + stream_QueryInterface, + stream_AddRef, + stream_Release, + stream_GetTypeInfoCount, + stream_GetTypeInfo, + stream_GetIDsOfNames, + stream_Invoke, + stream_get_Size, + stream_get_EOS, + stream_get_Position, + stream_put_Position, + stream_get_Type, + stream_put_Type, + stream_get_LineSeparator, + stream_put_LineSeparator, + stream_get_State, + stream_get_Mode, + stream_put_Mode, + stream_get_Charset, + stream_put_Charset, + stream_Read, + stream_Open, + stream_Close, + stream_SkipLine, + stream_Write, + stream_SetEOS, + stream_CopyTo, + stream_Flush, + stream_SaveToFile, + stream_LoadFromFile, + stream_ReadText, + stream_WriteText, + stream_Cancel +}; + +HRESULT Stream_create( void **obj ) +{ + struct stream *stream; + + if (!(stream = heap_alloc_zero( sizeof(*stream) ))) return E_OUTOFMEMORY; + stream->Stream_iface.lpVtbl = &stream_vtbl; + stream->refs = 1; + + *obj = &stream->Stream_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} -- 2.20.1

1 0

[PATCH 3/5] msado15: Add a stub _Recordset implementation.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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(-) create mode 100644 dlls/msado15/recordset.c diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index b901944bc1..5b255df323 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -5,7 +5,8 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ connection.c \ - main.c + main.c \ + recordset.c IDL_SRCS = \ msado15_classes.idl \ diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index d292826b1f..321ba40e3b 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -118,6 +118,7 @@ static const struct IClassFactoryVtbl msadocf_vtbl = }; static struct msadocf connection_cf = { { &msadocf_vtbl }, Connection_create }; +static struct msadocf recordset_cf = { { &msadocf_vtbl }, Recordset_create }; /*********************************************************************** * DllGetClassObject @@ -132,6 +133,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) { cf = &connection_cf.IClassFactory_iface; } + else if (IsEqualGUID( clsid, &CLSID_Recordset )) + { + cf = &recordset_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, obj ); } diff --git a/dlls/msado15/msado15_classes.idl b/dlls/msado15/msado15_classes.idl index f69fea0a1a..56e86a0dc6 100644 --- a/dlls/msado15/msado15_classes.idl +++ b/dlls/msado15/msado15_classes.idl @@ -25,3 +25,11 @@ uuid(00000514-0000-0010-8000-00aa006d2ea4) ] coclass Connection { interface _Connection; } + +[ + threading(both), + progid("ADODB.Recordset.6.0"), + vi_progid("ADODB.Recordset"), + uuid(00000535-0000-0010-8000-00aa006d2ea4) +] +coclass Recordset { interface _Recordset; } diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 1d4c379443..1f8948522b 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -20,5 +20,6 @@ #define _WINE_MSADO15_PRIVATE_H_ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; +HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; #endif /* _WINE_MSADO15_PRIVATE_H_ */ diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c new file mode 100644 index 0000000000..bf0ca6e90f --- /dev/null +++ b/dlls/msado15/recordset.c @@ -0,0 +1,686 @@ +/* + * 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 <stdarg.h> +#include <assert.h> +#include "windef.h" +#include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "msado15_backcompat.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado15); + +struct recordset +{ + _Recordset Recordset_iface; + LONG refs; +}; + +static inline struct recordset *impl_from_Recordset( _Recordset *iface ) +{ + return CONTAINING_RECORD( iface, struct recordset, Recordset_iface ); +} + +static ULONG WINAPI recordset_AddRef( _Recordset *iface ) +{ + struct recordset *recordset = impl_from_Recordset( iface ); + LONG refs = InterlockedIncrement( &recordset->refs ); + TRACE( "%p new refcount %d\n", recordset, refs ); + return refs; +} + +static ULONG WINAPI recordset_Release( _Recordset *iface ) +{ + struct recordset *recordset = impl_from_Recordset( iface ); + LONG refs = InterlockedDecrement( &recordset->refs ); + TRACE( "%p new refcount %d\n", recordset, refs ); + if (!refs) + { + TRACE( "destroying %p\n", recordset ); + heap_free( recordset ); + } + return refs; +} + +static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID__Recordset ) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + recordset_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI recordset_GetTypeInfoCount( _Recordset *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_GetTypeInfo( _Recordset *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_GetIDsOfNames( _Recordset *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Invoke( _Recordset *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Properties( _Recordset *iface, Properties **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_AbsolutePosition( _Recordset *iface, PositionEnum_Param *pos ) +{ + FIXME( "%p, %p\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_AbsolutePosition( _Recordset *iface, PositionEnum_Param pos ) +{ + FIXME( "%p, %d\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_putref_ActiveConnection( _Recordset *iface, IDispatch *connection ) +{ + FIXME( "%p, %p\n", iface, connection ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_ActiveConnection( _Recordset *iface, VARIANT connection ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&connection) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_ActiveConnection( _Recordset *iface, VARIANT *connection ) +{ + FIXME( "%p, %p\n", iface, connection ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_BOF( _Recordset *iface, VARIANT_BOOL *bof ) +{ + FIXME( "%p, %p\n", iface, bof ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Bookmark( _Recordset *iface, VARIANT *bookmark ) +{ + FIXME( "%p, %p\n", iface, bookmark ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Bookmark( _Recordset *iface, VARIANT bookmark ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&bookmark) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_CacheSize( _Recordset *iface, LONG *size ) +{ + FIXME( "%p, %p\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_CacheSize( _Recordset *iface, LONG size ) +{ + FIXME( "%p, %d\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_CursorType( _Recordset *iface, CursorTypeEnum *cursor_type ) +{ + FIXME( "%p, %p\n", iface, cursor_type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_CursorType( _Recordset *iface, CursorTypeEnum cursor_type ) +{ + FIXME( "%p, %d\n", iface, cursor_type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_EOF( _Recordset *iface, VARIANT_BOOL *eof ) +{ + FIXME( "%p, %p\n", iface, eof ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Fields( _Recordset *iface, Fields **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_LockType( _Recordset *iface, LockTypeEnum *lock_type ) +{ + FIXME( "%p, %p\n", iface, lock_type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_LockType( _Recordset *iface, LockTypeEnum lock_type ) +{ + FIXME( "%p, %d\n", iface, lock_type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, LONG *max_records ) +{ + FIXME( "%p, %p\n", iface, max_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, LONG max_records ) +{ + FIXME( "%p, %d\n", iface, max_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, LONG *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_putref_Source( _Recordset *iface, IDispatch *source ) +{ + FIXME( "%p, %p\n", iface, source ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Source( _Recordset *iface, BSTR source ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(source) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Source( _Recordset *iface, VARIANT *source ) +{ + FIXME( "%p, %p\n", iface, source ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_AddNew( _Recordset *iface, VARIANT field_list, VARIANT values ) +{ + FIXME( "%p, %s, %s\n", iface, debugstr_variant(&field_list), debugstr_variant(&values) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_CancelUpdate( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Close( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Delete( _Recordset *iface, AffectEnum affect_records ) +{ + FIXME( "%p, %u\n", iface, affect_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_GetRows( _Recordset *iface, LONG rows, VARIANT start, VARIANT fields, VARIANT *var ) +{ + FIXME( "%p, %d, %s, %s, %p\n", iface, rows, debugstr_variant(&start), debugstr_variant(&fields), var ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Move( _Recordset *iface, LONG num_records, VARIANT start ) +{ + FIXME( "%p, %d, %s\n", iface, num_records, debugstr_variant(&start) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_MoveNext( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_MovePrevious( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_MoveFirst( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_MoveLast( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT active_connection, + CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) +{ + FIXME( "%p, %s, %s, %d, %d, %d\n", iface, debugstr_variant(&source), debugstr_variant(&active_connection), + cursor_type, lock_type, options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Requery( _Recordset *iface, LONG options ) +{ + FIXME( "%p, %d\n", iface, options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset__xResync( _Recordset *iface, AffectEnum affect_records ) +{ + FIXME( "%p, %u\n", iface, affect_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Update( _Recordset *iface, VARIANT fields, VARIANT values ) +{ + FIXME( "%p, %s, %s\n", iface, debugstr_variant(&fields), debugstr_variant(&values) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_AbsolutePage( _Recordset *iface, PositionEnum_Param *pos ) +{ + FIXME( "%p, %p\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_AbsolutePage( _Recordset *iface, PositionEnum_Param pos ) +{ + FIXME( "%p, %d\n", iface, pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_EditMode( _Recordset *iface, EditModeEnum *mode ) +{ + FIXME( "%p, %p\n", iface, mode ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Filter( _Recordset *iface, VARIANT *criteria ) +{ + FIXME( "%p, %p\n", iface, criteria ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Filter( _Recordset *iface, VARIANT criteria ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&criteria) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_PageCount( _Recordset *iface, LONG *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_PageSize( _Recordset *iface, LONG *size ) +{ + FIXME( "%p, %p\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_PageSize( _Recordset *iface, LONG size ) +{ + FIXME( "%p, %d\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Sort( _Recordset *iface, BSTR *criteria ) +{ + FIXME( "%p, %p\n", iface, criteria ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Sort( _Recordset *iface, BSTR criteria ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(criteria) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Status( _Recordset *iface, LONG *status ) +{ + FIXME( "%p, %p\n", iface, status ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_State( _Recordset *iface, LONG *state ) +{ + FIXME( "%p, %p\n", iface, state ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset__xClone( _Recordset *iface, _Recordset **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_UpdateBatch( _Recordset *iface, AffectEnum affect_records ) +{ + FIXME( "%p, %u\n", iface, affect_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_CancelBatch( _Recordset *iface, AffectEnum affect_records ) +{ + FIXME( "%p, %u\n", iface, affect_records ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_CursorLocation( _Recordset *iface, CursorLocationEnum *cursor_loc ) +{ + FIXME( "%p, %p\n", iface, cursor_loc ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLocationEnum cursor_loc ) +{ + FIXME( "%p, %u\n", iface, cursor_loc ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_NextRecordset( _Recordset *iface, VARIANT *records_affected, _Recordset **record_set ) +{ + FIXME( "%p, %p, %p\n", iface, records_affected, record_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Supports( _Recordset *iface, CursorOptionEnum cursor_options, VARIANT_BOOL *ret ) +{ + FIXME( "%p, %08x, %p\n", iface, cursor_options, ret ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Collect( _Recordset *iface, VARIANT index, VARIANT *var ) +{ + FIXME( "%p, %s, %p\n", iface, debugstr_variant(&index), var ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Collect( _Recordset *iface, VARIANT index, VARIANT var ) +{ + FIXME( "%p, %s, %s\n", iface, debugstr_variant(&index), debugstr_variant(&var) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_MarshalOptions( _Recordset *iface, MarshalOptionsEnum *options ) +{ + FIXME( "%p, %p\n", iface, options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_MarshalOptions( _Recordset *iface, MarshalOptionsEnum options ) +{ + FIXME( "%p, %u\n", iface, options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Find( _Recordset *iface, BSTR criteria, LONG skip_records, + SearchDirectionEnum search_direction, VARIANT start ) +{ + FIXME( "%p, %s, %d, %d, %s\n", iface, debugstr_w(criteria), skip_records, search_direction, + debugstr_variant(&start) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Cancel( _Recordset *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_DataSource( _Recordset *iface, IUnknown **data_source ) +{ + FIXME( "%p, %p\n", iface, data_source ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_putref_DataSource( _Recordset *iface, IUnknown *data_source ) +{ + FIXME( "%p, %p\n", iface, data_source ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset__xSave( _Recordset *iface, BSTR filename, PersistFormatEnum persist_format ) +{ + FIXME( "%p, %s, %u\n", iface, debugstr_w(filename), persist_format ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_ActiveCommand( _Recordset *iface, IDispatch **cmd ) +{ + FIXME( "%p, %p\n", iface, cmd ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_StayInSync( _Recordset *iface, VARIANT_BOOL stay_in_sync ) +{ + FIXME( "%p, %d\n", iface, stay_in_sync ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_StayInSync( _Recordset *iface, VARIANT_BOOL *stay_in_sync ) +{ + FIXME( "%p, %p\n", iface, stay_in_sync ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_GetString( _Recordset *iface, StringFormatEnum string_format, LONG num_rows, + BSTR column_delimeter, BSTR row_delimeter, BSTR null_expr, + BSTR *ret_string ) +{ + FIXME( "%p, %u, %d, %s, %s, %s, %p\n", iface, string_format, num_rows, debugstr_w(column_delimeter), + debugstr_w(row_delimeter), debugstr_w(null_expr), ret_string ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_DataMember( _Recordset *iface, BSTR *data_member ) +{ + FIXME( "%p, %p\n", iface, data_member ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_DataMember( _Recordset *iface, BSTR data_member ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(data_member) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_CompareBookmarks( _Recordset *iface, VARIANT bookmark1, VARIANT bookmark2, CompareEnum *compare ) +{ + FIXME( "%p, %s, %s, %p\n", iface, debugstr_variant(&bookmark1), debugstr_variant(&bookmark2), compare ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Clone( _Recordset *iface, LockTypeEnum lock_type, _Recordset **obj ) +{ + FIXME( "%p, %d, %p\n", iface, lock_type, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Resync( _Recordset *iface, AffectEnum affect_records, ResyncEnum resync_values ) +{ + FIXME( "%p, %u, %u\n", iface, affect_records, resync_values ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Seek( _Recordset *iface, VARIANT key_values, SeekEnum seek_option ) +{ + FIXME( "%p, %s, %u\n", iface, debugstr_variant(&key_values), seek_option ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_put_Index( _Recordset *iface, BSTR index ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(index) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_get_Index( _Recordset *iface, BSTR *index ) +{ + FIXME( "%p, %p\n", iface, index ); + return E_NOTIMPL; +} + +static HRESULT WINAPI recordset_Save( _Recordset *iface, VARIANT destination, PersistFormatEnum persist_format ) +{ + FIXME( "%p, %s, %u\n", iface, debugstr_variant(&destination), persist_format ); + return E_NOTIMPL; +} + +static const struct _RecordsetVtbl recordset_vtbl = +{ + recordset_QueryInterface, + recordset_AddRef, + recordset_Release, + recordset_GetTypeInfoCount, + recordset_GetTypeInfo, + recordset_GetIDsOfNames, + recordset_Invoke, + recordset_get_Properties, + recordset_get_AbsolutePosition, + recordset_put_AbsolutePosition, + recordset_putref_ActiveConnection, + recordset_put_ActiveConnection, + recordset_get_ActiveConnection, + recordset_get_BOF, + recordset_get_Bookmark, + recordset_put_Bookmark, + recordset_get_CacheSize, + recordset_put_CacheSize, + recordset_get_CursorType, + recordset_put_CursorType, + recordset_get_EOF, + recordset_get_Fields, + recordset_get_LockType, + recordset_put_LockType, + recordset_get_MaxRecords, + recordset_put_MaxRecords, + recordset_get_RecordCount, + recordset_putref_Source, + recordset_put_Source, + recordset_get_Source, + recordset_AddNew, + recordset_CancelUpdate, + recordset_Close, + recordset_Delete, + recordset_GetRows, + recordset_Move, + recordset_MoveNext, + recordset_MovePrevious, + recordset_MoveFirst, + recordset_MoveLast, + recordset_Open, + recordset_Requery, + recordset__xResync, + recordset_Update, + recordset_get_AbsolutePage, + recordset_put_AbsolutePage, + recordset_get_EditMode, + recordset_get_Filter, + recordset_put_Filter, + recordset_get_PageCount, + recordset_get_PageSize, + recordset_put_PageSize, + recordset_get_Sort, + recordset_put_Sort, + recordset_get_Status, + recordset_get_State, + recordset__xClone, + recordset_UpdateBatch, + recordset_CancelBatch, + recordset_get_CursorLocation, + recordset_put_CursorLocation, + recordset_NextRecordset, + recordset_Supports, + recordset_get_Collect, + recordset_put_Collect, + recordset_get_MarshalOptions, + recordset_put_MarshalOptions, + recordset_Find, + recordset_Cancel, + recordset_get_DataSource, + recordset_putref_DataSource, + recordset__xSave, + recordset_get_ActiveCommand, + recordset_put_StayInSync, + recordset_get_StayInSync, + recordset_GetString, + recordset_get_DataMember, + recordset_put_DataMember, + recordset_CompareBookmarks, + recordset_Clone, + recordset_Resync, + recordset_Seek, + recordset_put_Index, + recordset_get_Index, + recordset_Save +}; + +HRESULT Recordset_create( void **obj ) +{ + struct recordset *recordset; + + if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; + recordset->Recordset_iface.lpVtbl = &recordset_vtbl; + recordset->refs = 1; + + *obj = &recordset->Recordset_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} -- 2.20.1

1 0

[PATCH 2/5] msado15: Add a stub _Connection implementation.
by Hans Leidekker Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/Makefile.in | 8 +- 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, 509 insertions(+), 4 deletions(-) create mode 100644 dlls/msado15/connection.c create mode 100644 dlls/msado15/msado15_classes.idl create mode 100644 dlls/msado15/msado15_private.h diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 779a18df14..b901944bc1 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -1,8 +1,12 @@ MODULE = msado15.dll +IMPORTS = oleaut32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - main.c \ + connection.c \ + main.c -IDL_SRCS = msado15_tlb.idl +IDL_SRCS = \ + msado15_classes.idl \ + msado15_tlb.idl diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c new file mode 100644 index 0000000000..f33bc89a1a --- /dev/null +++ b/dlls/msado15/connection.c @@ -0,0 +1,344 @@ +/* + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "msado15_backcompat.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado15); + +struct connection +{ + _Connection Connection_iface; + LONG refs; +}; + +static inline struct connection *impl_from_Connection( _Connection *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, Connection_iface ); +} + +static ULONG WINAPI connection_AddRef( _Connection *iface ) +{ + struct connection *connection = impl_from_Connection( iface ); + return InterlockedIncrement( &connection->refs ); +} + +static ULONG WINAPI connection_Release( _Connection *iface ) +{ + struct connection *connection = impl_from_Connection( iface ); + LONG refs = InterlockedDecrement( &connection->refs ); + if (!refs) + { + TRACE( "destroying %p\n", connection ); + heap_free( connection ); + } + return refs; +} + +static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + connection_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI connection_GetTypeInfoCount( _Connection *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetTypeInfo( _Connection *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetIDsOfNames( _Connection *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Invoke( _Connection *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) +{ + FIXME( "%p, %p\n", iface, str ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(str) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) +{ + FIXME( "%p, %p\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_CommandTimeout( _Connection *iface, LONG timeout ) +{ + FIXME( "%p, %d\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_ConnectionTimeout( _Connection *iface, LONG *timeout ) +{ + FIXME( "%p, %p\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_ConnectionTimeout( _Connection *iface, LONG timeout ) +{ + FIXME( "%p, %d\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Version( _Connection *iface, BSTR *str ) +{ + FIXME( "%p, %p\n", iface, str ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Close( _Connection *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, + LONG options, _Recordset **record_set ) +{ + FIXME( "%p, %s, %p, %08x, %p\n", iface, debugstr_w(command), records_affected, options, record_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_BeginTrans( _Connection *iface, LONG *transaction_level ) +{ + FIXME( "%p, %p\n", iface, transaction_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_CommitTrans( _Connection *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_RollbackTrans( _Connection *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BSTR userid, BSTR password, + LONG options ) +{ + FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), + debugstr_w(password), options ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Errors( _Connection *iface, Errors **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_DefaultDatabase( _Connection *iface, BSTR *str ) +{ + FIXME( "%p, %p\n", iface, str ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_DefaultDatabase( _Connection *iface, BSTR str ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(str) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_IsolationLevel( _Connection *iface, IsolationLevelEnum *level ) +{ + FIXME( "%p, %p\n", iface, level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_IsolationLevel( _Connection *iface, IsolationLevelEnum level ) +{ + FIXME( "%p, %d\n", iface, level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Attributes( _Connection *iface, LONG *attr ) +{ + FIXME( "%p, %p\n", iface, attr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_Attributes( _Connection *iface, LONG attr ) +{ + FIXME( "%p, %d\n", iface, attr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_CursorLocation( _Connection *iface, CursorLocationEnum *cursor_loc ) +{ + FIXME( "%p, %p\n", iface, cursor_loc ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_CursorLocation( _Connection *iface, CursorLocationEnum cursor_loc ) +{ + FIXME( "%p, %u\n", iface, cursor_loc ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Mode( _Connection *iface, ConnectModeEnum *mode ) +{ + FIXME( "%p, %p\n", iface, mode ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_Mode( _Connection *iface, ConnectModeEnum mode ) +{ + FIXME( "%p, %u\n", iface, mode ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_Provider( _Connection *iface, BSTR *str ) +{ + FIXME( "%p, %p\n", iface, str ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_put_Provider( _Connection *iface, BSTR str ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(str) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_State( _Connection *iface, LONG *state ) +{ + FIXME( "%p, %p\n", iface, state ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_OpenSchema( _Connection *iface, SchemaEnum schema, VARIANT restrictions, + VARIANT schema_id, _Recordset **record_set ) +{ + FIXME( "%p, %d, %s, %s, %p\n", iface, schema, debugstr_variant(&restrictions), + debugstr_variant(&schema_id), record_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Cancel( _Connection *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static const struct _ConnectionVtbl connection_vtbl = +{ + connection_QueryInterface, + connection_AddRef, + connection_Release, + connection_GetTypeInfoCount, + connection_GetTypeInfo, + connection_GetIDsOfNames, + connection_Invoke, + connection_get_Properties, + connection_get_ConnectionString, + connection_put_ConnectionString, + connection_get_CommandTimeout, + connection_put_CommandTimeout, + connection_get_ConnectionTimeout, + connection_put_ConnectionTimeout, + connection_get_Version, + connection_Close, + connection_Execute, + connection_BeginTrans, + connection_CommitTrans, + connection_RollbackTrans, + connection_Open, + connection_get_Errors, + connection_get_DefaultDatabase, + connection_put_DefaultDatabase, + connection_get_IsolationLevel, + connection_put_IsolationLevel, + connection_get_Attributes, + connection_put_Attributes, + connection_get_CursorLocation, + connection_put_CursorLocation, + connection_get_Mode, + connection_put_Mode, + connection_get_Provider, + connection_put_Provider, + connection_get_State, + connection_OpenSchema, + connection_Cancel +}; + +HRESULT Connection_create( void **obj ) +{ + struct connection *connection; + + if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; + connection->Connection_iface.lpVtbl = &connection_vtbl; + connection->refs = 1; + + *obj = &connection->Connection_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 0c5b2615d0..d292826b1f 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -19,10 +19,18 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "initguid.h" +#define COBJMACROS #include "objbase.h" #include "rpcproxy.h" +#include "msado15_backcompat.h" #include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado15); static HINSTANCE hinstance; @@ -38,6 +46,104 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) return TRUE; } +typedef HRESULT (*fnCreateInstance)( void **obj ); + +struct msadocf +{ + IClassFactory IClassFactory_iface; + fnCreateInstance pfnCreateInstance; +}; + +static inline struct msadocf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct msadocf, IClassFactory_iface ); +} + +static HRESULT WINAPI msadocf_QueryInterface( IClassFactory *iface, REFIID riid, void **obj ) +{ + if (IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IClassFactory )) + { + IClassFactory_AddRef( iface ); + *obj = iface; + return S_OK; + } + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; +} + +static ULONG WINAPI msadocf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI msadocf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI msadocf_CreateInstance( IClassFactory *iface, LPUNKNOWN outer, REFIID riid, void **obj ) +{ + struct msadocf *cf = impl_from_IClassFactory( iface ); + IUnknown *unknown; + HRESULT hr; + + TRACE( "%p, %s, %p\n", outer, debugstr_guid(riid), obj ); + + *obj = NULL; + if (outer) + return CLASS_E_NOAGGREGATION; + + hr = cf->pfnCreateInstance( (void **)&unknown ); + if (FAILED(hr)) + return hr; + + hr = IUnknown_QueryInterface( unknown, riid, obj ); + IUnknown_Release( unknown ); + return hr; +} + +static HRESULT WINAPI msadocf_LockServer( IClassFactory *iface, BOOL dolock ) +{ + FIXME( "%p, %d\n", iface, dolock ); + return S_OK; +} + +static const struct IClassFactoryVtbl msadocf_vtbl = +{ + msadocf_QueryInterface, + msadocf_AddRef, + msadocf_Release, + msadocf_CreateInstance, + msadocf_LockServer +}; + +static struct msadocf connection_cf = { { &msadocf_vtbl }, Connection_create }; + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) +{ + IClassFactory *cf = NULL; + + TRACE( "%s, %s, %p\n", debugstr_guid(clsid), debugstr_guid(iid), obj ); + + if (IsEqualGUID( clsid, &CLSID_Connection )) + { + cf = &connection_cf.IClassFactory_iface; + } + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, obj ); +} + +/****************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + /*********************************************************************** * DllRegisterServer */ diff --git a/dlls/msado15/msado15.spec b/dlls/msado15/msado15.spec index 6d0e061a53..b16365d0c9 100644 --- a/dlls/msado15/msado15.spec +++ b/dlls/msado15/msado15.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/msado15/msado15_classes.idl b/dlls/msado15/msado15_classes.idl new file mode 100644 index 0000000000..f69fea0a1a --- /dev/null +++ b/dlls/msado15/msado15_classes.idl @@ -0,0 +1,27 @@ +/* + * 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 + */ + +#pragma makedep register + +[ + threading(apartment), + progid("ADODB.Connection.6.0"), + vi_progid("ADODB.Connection"), + uuid(00000514-0000-0010-8000-00aa006d2ea4) +] +coclass Connection { interface _Connection; } diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h new file mode 100644 index 0000000000..1d4c379443 --- /dev/null +++ b/dlls/msado15/msado15_private.h @@ -0,0 +1,24 @@ +/* + * 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 + */ + +#ifndef _WINE_MSADO15_PRIVATE_H_ +#define _WINE_MSADO15_PRIVATE_H_ + +HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; + +#endif /* _WINE_MSADO15_PRIVATE_H_ */ -- 2.20.1

1 0

[PATCH] dwrite/tests: Add some tests for reference objects.
by Nikolay Sivov Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 110 ++++++++++++++++++++++++++------------- 1 file changed, 75 insertions(+), 35 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 5ab01465b7..a0d36e2f0b 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7558,12 +7558,12 @@ static void test_CreateFontFaceReference(void) static const WCHAR dummyW[] = {'d','u','m','m','y',0}; IDWriteFontFace3 *fontface, *fontface1; IDWriteFontFaceReference *ref, *ref1; + IDWriteFontCollection1 *collection; IDWriteFontFile *file, *file1; IDWriteFactory3 *factory; + UINT32 index, count, i; IDWriteFont3 *font3; - IDWriteFont *font; ULONG refcount; - UINT32 index; WCHAR *path; HRESULT hr; BOOL ret; @@ -7672,47 +7672,87 @@ todo_wine IDWriteFontFile_Release(file); IDWriteFontFile_Release(file1); - /* references returned from IDWriteFont3 */ - font = get_tahoma_instance((IDWriteFactory *)factory, DWRITE_FONT_STYLE_NORMAL); - hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont3, (void**)&font3); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteFont_Release(font); + /* References returned from IDWriteFont3/IDWriteFontFace3. */ + hr = IDWriteFactory3_GetSystemFontCollection(factory, FALSE, &collection, FALSE); + ok(hr == S_OK, "Failed to get system collection, hr %#x.\n", hr); - hr = IDWriteFont3_GetFontFaceReference(font3, &ref); - ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection1_GetFontFamilyCount(collection); + for (i = 0; i < count; i++) + { + IDWriteFontFamily1 *family; + UINT32 font_count, j; - hr = IDWriteFont3_GetFontFaceReference(font3, &ref1); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(ref != ref1, "got %p, %p\n", ref1, ref); + hr = IDWriteFontCollection1_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); - IDWriteFontFaceReference_Release(ref); - IDWriteFontFaceReference_Release(ref1); + font_count = IDWriteFontFamily1_GetFontCount(family); - /* references returned from IDWriteFontFace3 */ - hr = IDWriteFont3_CreateFontFace(font3, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); + for (j = 0; j < font_count; j++) + { + IDWriteFontFaceReference1 *ref2; - hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref); -todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFamily1_GetFont(family, j, &font3); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); - hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref1); -todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) - ok(ref == ref1, "got %p, %p\n", ref1, ref); + hr = IDWriteFont3_GetFontFaceReference(font3, &ref); + ok(hr == S_OK, "Failed to get reference object, hr %#x.\n", hr); -if (hr == S_OK) { - hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface1); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fontface1 == fontface, "got %p, %p\n", fontface1, fontface); - IDWriteFontFace3_Release(fontface1); + hr = IDWriteFont3_GetFontFaceReference(font3, &ref1); + ok(hr == S_OK, "Failed to get reference object, hr %#x.\n", hr); + ok(ref != ref1, "Unexpected reference object %p, %p.\n", ref1, ref); - IDWriteFontFaceReference_Release(ref); - IDWriteFontFaceReference_Release(ref1); -} - IDWriteFontFace3_Release(fontface); - IDWriteFont3_Release(font3); + hr = IDWriteFont3_CreateFontFace(font3, &fontface); + ok(hr == S_OK, "Failed to create a fontface, hr %#x.\n", hr); + + /* Fonts present regular properties as axis values, for non-variable fonts too. + Normally it would include weight/width/slant/italic, but could also contain optical size axis. */ + if (SUCCEEDED(hr = IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, + (void **)&ref2))) + { + UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); + todo_wine + ok(axis_count > 0, "Unexpected axis value count.\n"); + IDWriteFontFaceReference1_Release(ref2); + } + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFaceReference_Release(ref1); + + hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref); + todo_wine + ok(hr == S_OK, "Failed to get a reference, hr %#x.\n", hr); + + hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref1); + todo_wine + ok(hr == S_OK, "Failed to get a reference, hr %#x.\n", hr); + if (hr == S_OK) + ok(ref == ref1, "Unexpected reference %p, %p.\n", ref1, ref); + + if (hr == S_OK) { + hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface1); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + ok(fontface1 == fontface, "Unexpected fontface %p, %p.\n", fontface1, fontface); + IDWriteFontFace3_Release(fontface1); + + if (SUCCEEDED(hr = IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, + (void **)&ref2))) + { + UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); + ok(!axis_count, "Unexpected axis value count.\n"); + IDWriteFontFaceReference1_Release(ref2); + } + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFaceReference_Release(ref1); + } + IDWriteFontFace3_Release(fontface); + + IDWriteFont3_Release(font3); + } + + IDWriteFontFamily1_Release(family); + } + IDWriteFontCollection1_Release(collection); refcount = IDWriteFactory3_Release(factory); ok(refcount == 0, "factory not released, %u\n", refcount); -- 2.24.0

1 0

[PATCH] dwrite: Use IDWriteFactory7 for analyzer.
by Nikolay Sivov Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 22 +++++++++++----------- dlls/dwrite/dwrite_private.h | 4 ++-- dlls/dwrite/main.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 8db5cc709b..a418081d49 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -238,7 +238,7 @@ struct dwrite_fontfallback { IDWriteFontFallback1 IDWriteFontFallback1_iface; LONG refcount; - IDWriteFactory5 *factory; + IDWriteFactory7 *factory; IDWriteFontCollection1 *systemcollection; struct fallback_mapping *mappings; UINT32 mappings_count; @@ -248,7 +248,7 @@ struct dwrite_fontfallback_builder { IDWriteFontFallbackBuilder IDWriteFontFallbackBuilder_iface; LONG refcount; - IDWriteFactory5 *factory; + IDWriteFactory7 *factory; struct fallback_mapping *mappings; size_t size; size_t count; @@ -1956,7 +1956,7 @@ static ULONG WINAPI fontfallback_AddRef(IDWriteFontFallback1 *iface) TRACE("%p.\n", iface); - return IDWriteFactory5_AddRef(fallback->factory); + return IDWriteFactory7_AddRef(fallback->factory); } static ULONG WINAPI fontfallback_Release(IDWriteFontFallback1 *iface) @@ -1965,7 +1965,7 @@ static ULONG WINAPI fontfallback_Release(IDWriteFontFallback1 *iface) TRACE("%p.\n", fallback); - return IDWriteFactory5_Release(fallback->factory); + return IDWriteFactory7_Release(fallback->factory); } static int compare_mapping_range(const void *a, const void *b) @@ -2174,7 +2174,7 @@ static const IDWriteFontFallback1Vtbl fontfallbackvtbl = fontfallback1_MapCharacters, }; -HRESULT create_system_fontfallback(IDWriteFactory5 *factory, IDWriteFontFallback1 **ret) +HRESULT create_system_fontfallback(IDWriteFactory7 *factory, IDWriteFontFallback1 **ret) { struct dwrite_fontfallback *fallback; @@ -2188,7 +2188,7 @@ HRESULT create_system_fontfallback(IDWriteFactory5 *factory, IDWriteFontFallback fallback->factory = factory; fallback->mappings = (struct fallback_mapping *)fontfallback_neutral_data; fallback->mappings_count = ARRAY_SIZE(fontfallback_neutral_data); - IDWriteFactory5_GetSystemFontCollection(fallback->factory, FALSE, &fallback->systemcollection, FALSE); + IDWriteFactory5_GetSystemFontCollection((IDWriteFactory5 *)fallback->factory, FALSE, &fallback->systemcollection, FALSE); *ret = &fallback->IDWriteFontFallback1_iface; @@ -2221,7 +2221,7 @@ static ULONG WINAPI customfontfallback_Release(IDWriteFontFallback1 *iface) if (!refcount) { - IDWriteFactory5_Release(fallback->factory); + IDWriteFactory7_Release(fallback->factory); heap_free(fallback); } @@ -2310,7 +2310,7 @@ static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *ifac heap_free(mapping->locale); } - IDWriteFactory5_Release(fallbackbuilder->factory); + IDWriteFactory7_Release(fallbackbuilder->factory); heap_free(fallbackbuilder->mappings); heap_free(fallbackbuilder); } @@ -2383,7 +2383,7 @@ static HRESULT WINAPI fontfallbackbuilder_CreateFontFallback(IDWriteFontFallback fallback->IDWriteFontFallback1_iface.lpVtbl = &customfontfallbackvtbl; fallback->refcount = 1; fallback->factory = fallbackbuilder->factory; - IDWriteFactory5_AddRef(fallback->factory); + IDWriteFactory7_AddRef(fallback->factory); *ret = (IDWriteFontFallback *)&fallback->IDWriteFontFallback1_iface; return S_OK; @@ -2399,7 +2399,7 @@ static const IDWriteFontFallbackBuilderVtbl fontfallbackbuildervtbl = fontfallbackbuilder_CreateFontFallback, }; -HRESULT create_fontfallback_builder(IDWriteFactory5 *factory, IDWriteFontFallbackBuilder **ret) +HRESULT create_fontfallback_builder(IDWriteFactory7 *factory, IDWriteFontFallbackBuilder **ret) { struct dwrite_fontfallback_builder *builder; @@ -2412,7 +2412,7 @@ HRESULT create_fontfallback_builder(IDWriteFactory5 *factory, IDWriteFontFallbac builder->IDWriteFontFallbackBuilder_iface.lpVtbl = &fontfallbackbuildervtbl; builder->refcount = 1; builder->factory = factory; - IDWriteFactory5_AddRef(builder->factory); + IDWriteFactory7_AddRef(builder->factory); *ret = &builder->IDWriteFontFallbackBuilder_iface; return S_OK; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index c2aef6b77c..cc5c028fd2 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -258,9 +258,9 @@ extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE extern HRESULT create_colorglyphenum(FLOAT,FLOAT,const DWRITE_GLYPH_RUN*,const DWRITE_GLYPH_RUN_DESCRIPTION*,DWRITE_MEASURING_MODE, const DWRITE_MATRIX*,UINT32,IDWriteColorGlyphRunEnumerator**) DECLSPEC_HIDDEN; extern BOOL lb_is_newline_char(WCHAR) DECLSPEC_HIDDEN; -extern HRESULT create_system_fontfallback(IDWriteFactory5 *factory, IDWriteFontFallback1 **fallback) DECLSPEC_HIDDEN; +extern HRESULT create_system_fontfallback(IDWriteFactory7 *factory, IDWriteFontFallback1 **fallback) DECLSPEC_HIDDEN; extern void release_system_fontfallback(IDWriteFontFallback1 *fallback) DECLSPEC_HIDDEN; -extern HRESULT create_fontfallback_builder(IDWriteFactory5*,IDWriteFontFallbackBuilder**) DECLSPEC_HIDDEN; +extern HRESULT create_fontfallback_builder(IDWriteFactory7 *factory, IDWriteFontFallbackBuilder **builder) DECLSPEC_HIDDEN; extern HRESULT create_matching_font(IDWriteFontCollection*,const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT create_fontfacereference(IDWriteFactory7 *factory, IDWriteFontFile *file, UINT32 face_index, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9c88ab6871..317a6cedaf 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1337,7 +1337,7 @@ static HRESULT WINAPI dwritefactory2_GetSystemFontFallback(IDWriteFactory7 *ifac if (!factory->fallback) { - HRESULT hr = create_system_fontfallback((IDWriteFactory5 *)iface, &factory->fallback); + HRESULT hr = create_system_fontfallback(iface, &factory->fallback); if (FAILED(hr)) return hr; } @@ -1352,7 +1352,7 @@ static HRESULT WINAPI dwritefactory2_CreateFontFallbackBuilder(IDWriteFactory7 * { TRACE("%p, %p.\n", iface, fallbackbuilder); - return create_fontfallback_builder((IDWriteFactory5 *)iface, fallbackbuilder); + return create_fontfallback_builder(iface, fallbackbuilder); } static HRESULT WINAPI dwritefactory2_TranslateColorGlyphRun(IDWriteFactory7 *iface, FLOAT originX, FLOAT originY, -- 2.24.0

1 0

[PATCH 1/2] secur32: Avoid compiler warning.
by Gijs Vermeulen Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/secur32/schannel_macosx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 050e8c5cce..d06267773a 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1202,7 +1202,7 @@ BOOL schan_imp_init(void) supported_protocols = SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT; #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 - if(SSLGetProtocolVersionMax != NULL) { + if(&SSLGetProtocolVersionMax != NULL) { SSLProtocol max_protocol; SSLContextRef ctx; OSStatus status; -- 2.24.0

1 1

[website] German translation for release 4.21
by Julian Rüger Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.0.3
by Julian Rüger Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.20
by Julian Rüger Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 1/2] oleaut32/typelib: Add a helper to update custom data lists on reallocation.
by Nikolay Sivov Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 45 +++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1971a41570..6d96cc5fbe 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1871,6 +1871,18 @@ static HRESULT TLB_set_custdata(struct list *custdata_list, TLBGuid *tlbguid, VA return VariantCopy(&cust_data->data, var); } +/* Used to update list pointers after list itself was moved. */ +static void TLB_relink_custdata(struct list *custdata_list) +{ + if (custdata_list->prev == custdata_list->next) + list_init(custdata_list); + else + { + custdata_list->prev->next = custdata_list; + custdata_list->next->prev = custdata_list; + } +} + static TLBString *TLB_append_str(struct list *string_list, BSTR new_str) { TLBString *str; @@ -10806,15 +10818,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc(ICreateTypeInfo2 *iface, /* move custdata lists to the new memory location */ for(i = 0; i < This->typeattr.cFuncs + 1; ++i){ - if(index != i){ - TLBFuncDesc *fd = &This->funcdescs[i]; - if(fd->custdata_list.prev == fd->custdata_list.next) - list_init(&fd->custdata_list); - else{ - fd->custdata_list.prev->next = &fd->custdata_list; - fd->custdata_list.next->prev = &fd->custdata_list; - } - } + if(index != i) + TLB_relink_custdata(&This->funcdescs[i].custdata_list); } } else func_desc = This->funcdescs = heap_alloc(sizeof(TLBFuncDesc)); @@ -10875,15 +10880,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface, /* move custdata lists to the new memory location */ for(i = 0; i < This->typeattr.cImplTypes + 1; ++i){ - if(index != i){ - TLBImplType *it = &This->impltypes[i]; - if(it->custdata_list.prev == it->custdata_list.next) - list_init(&it->custdata_list); - else{ - it->custdata_list.prev->next = &it->custdata_list; - it->custdata_list.next->prev = &it->custdata_list; - } - } + if(index != i) + TLB_relink_custdata(&This->impltypes[i].custdata_list); } } else impl_type = This->impltypes = heap_alloc(sizeof(TLBImplType)); @@ -10975,15 +10973,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, /* move custdata lists to the new memory location */ for(i = 0; i < This->typeattr.cVars + 1; ++i){ - if(index != i){ - TLBVarDesc *var = &This->vardescs[i]; - if(var->custdata_list.prev == var->custdata_list.next) - list_init(&var->custdata_list); - else{ - var->custdata_list.prev->next = &var->custdata_list; - var->custdata_list.next->prev = &var->custdata_list; - } - } + if(index != i) + TLB_relink_custdata(&This->vardescs[i].custdata_list); } } else var_desc = This->vardescs = heap_alloc_zero(sizeof(TLBVarDesc)); -- 2.24.0

1 1

[PATCH] kernelbase: Fix GlobalMemoryStatusEx regression.
by hari.mail Dec. 6, 2019

Dec. 6, 2019

Empty Message

2 1

[PATCH v2 1/4] strmbase: Correctly implement IVideoWindow::NotifyOwnerMessage().
by Zebediah Figura Dec. 6, 2019

Dec. 6, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43367 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 40 +++++++++++++++++++++++++++++-- dlls/strmbase/window.c | 24 +++++++++++++++---- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ec089c8444..b2202d7ae7 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1812,10 +1812,27 @@ static void test_video_window_owner(IVideoWindow *window, HWND hwnd, HWND our_hw ok(state == OATRUE, "Got state %d.\n", state); } +struct notify_message_params +{ + IVideoWindow *window; + HWND hwnd; + UINT message; +}; + +static DWORD CALLBACK notify_message_proc(void *arg) +{ + const struct notify_message_params *params = arg; + HRESULT hr = IVideoWindow_NotifyOwnerMessage(params->window, (OAHWND)params->hwnd, params->message, 0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return 0; +} + static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our_hwnd) { + struct notify_message_params params; unsigned int i; OAHWND oahwnd; + HANDLE thread; HRESULT hr; BOOL ret; MSG msg; @@ -1886,14 +1903,33 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our ok(hr == S_OK, "Got hr %#x.\n", hr); ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - todo_wine ok(!ret, "Got unexpected status %#x.\n", ret); + ok(!ret, "Got unexpected status %#x.\n", ret); hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - todo_wine ok(!ret, "Got unexpected status %#x.\n", ret); + ok(!ret, "Got unexpected status %#x.\n", ret); + + params.window = window; + params.hwnd = our_hwnd; + params.message = WM_SYSCOLORCHANGE; + thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); + ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); + ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + CloseHandle(thread); + + params.message = WM_SETCURSOR; + thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "Thread should not block.\n"); + CloseHandle(thread); + ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); + ok(!ret, "Got unexpected status %#x.\n", ret); hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index be6646c27a..04132aaab1 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -654,14 +654,28 @@ HRESULT WINAPI BaseControlWindowImpl_GetWindowPosition(IVideoWindow *iface, LONG return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_NotifyOwnerMessage(IVideoWindow *iface, OAHWND hwnd, LONG uMsg, LONG_PTR wParam, LONG_PTR lParam) +HRESULT WINAPI BaseControlWindowImpl_NotifyOwnerMessage(IVideoWindow *iface, + OAHWND hwnd, LONG message, LONG_PTR wparam, LONG_PTR lparam) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); + BaseControlWindow *window = impl_from_IVideoWindow(iface); - TRACE("(%p/%p)->(%08lx, %d, %08lx, %08lx)\n", This, iface, hwnd, uMsg, wParam, lParam); + TRACE("window %p, hwnd %#lx, message %#x, wparam %#lx, lparam %#lx.\n", + window, hwnd, message, wparam, lparam); - if (!PostMessageW(This->baseWindow.hWnd, uMsg, wParam, lParam)) - return E_FAIL; + /* That these messages are forwarded, and no others, is stated by the + * DirectX documentation, and supported by manual testing. */ + switch (message) + { + case WM_ACTIVATEAPP: + case WM_DEVMODECHANGE: + case WM_DISPLAYCHANGE: + case WM_PALETTECHANGED: + case WM_PALETTEISCHANGING: + case WM_QUERYNEWPALETTE: + case WM_SYSCOLORCHANGE: + SendMessageW(window->baseWindow.hWnd, message, wparam, lparam); + break; + } return S_OK; } -- 2.24.0

2 4

[PATCH] kernel32/tests: Allow for differing fpu_cw returned on Windows XP.
by Jeff Smith Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/kernel32/tests/thread.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 9a8ad9151c..beec84e044 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1745,14 +1745,16 @@ static unsigned int get_thread_fpu_cw( unsigned long *fpu_cw ) static void test_thread_fpu_cw(void) { - static const struct { unsigned int cw; unsigned long fpu_cw; } expected_cw[6] = + static const struct { + unsigned int cw; unsigned long fpu_cw; unsigned long fpu_cw_alt; + } expected_cw[6] = { #ifdef __i386__ { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, - { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ) }, + { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ), MAKELONG( 0xc60, 0x1f80 ) }, { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, - { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ) }, + { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ), MAKELONG( 0xc60, 0x1f80 ) }, { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) } #elif defined(__x86_64__) { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) }, @@ -1788,7 +1790,9 @@ static void test_thread_fpu_cw(void) cw = _control87( 0, 0 ); fpu_cw = get_fpu_cw(); ok(cw == expected_cw[2].cw, "expected %#x got %#x\n", expected_cw[2].cw, cw); - ok(fpu_cw == expected_cw[2].fpu_cw, "expected %#lx got %#lx\n", expected_cw[2].fpu_cw, fpu_cw); + ok(fpu_cw == expected_cw[2].fpu_cw || + broken(expected_cw[2].fpu_cw_alt != 0 && fpu_cw == expected_cw[2].fpu_cw_alt), + "expected %#lx got %#lx\n", expected_cw[2].fpu_cw, fpu_cw); cw = get_thread_fpu_cw( &fpu_cw ); ok(cw == expected_cw[3].cw, "expected %#x got %#x\n", expected_cw[3].cw, cw); @@ -1797,7 +1801,9 @@ static void test_thread_fpu_cw(void) cw = _control87( 0, 0 ); fpu_cw = get_fpu_cw(); ok(cw == expected_cw[4].cw, "expected %#x got %#x\n", expected_cw[4].cw, cw); - ok(fpu_cw == expected_cw[4].fpu_cw, "expected %#lx got %#lx\n", expected_cw[4].fpu_cw, fpu_cw); + ok(fpu_cw == expected_cw[4].fpu_cw || + broken(expected_cw[4].fpu_cw_alt != 0 && fpu_cw == expected_cw[4].fpu_cw_alt), + "expected %#lx got %#lx\n", expected_cw[4].fpu_cw, fpu_cw); _control87( initial_cw, _MCW_EM | _MCW_RC | _MCW_PC ); cw = _control87( 0, 0 ); -- 2.23.0

1 0

[PATCH 1/4] strmbase: Correctly implement IVideoWindow::NotifyOwnerMessage().
by Zebediah Figura Dec. 6, 2019

Dec. 6, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43367 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43765 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 40 +++++++++++++++++++++++++++++-- dlls/strmbase/window.c | 24 +++++++++++++++---- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index a9f938074b..320d8920d1 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1888,10 +1888,27 @@ static void test_video_window_owner(IVideoWindow *window, HWND hwnd, HWND our_hw ok(state == OATRUE, "Got state %d.\n", state); } +struct notify_message_params +{ + IVideoWindow *window; + HWND hwnd; + UINT message; +}; + +static DWORD CALLBACK notify_message_proc(void *arg) +{ + const struct notify_message_params *params = arg; + HRESULT hr = IVideoWindow_NotifyOwnerMessage(params->window, (OAHWND)params->hwnd, params->message, 0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return 0; +} + static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our_hwnd) { + struct notify_message_params params; unsigned int i; OAHWND oahwnd; + HANDLE thread; HRESULT hr; BOOL ret; MSG msg; @@ -1962,14 +1979,33 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our ok(hr == S_OK, "Got hr %#x.\n", hr); ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - todo_wine ok(!ret, "Got unexpected status %#x.\n", ret); + ok(!ret, "Got unexpected status %#x.\n", ret); hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - todo_wine ok(!ret, "Got unexpected status %#x.\n", ret); + ok(!ret, "Got unexpected status %#x.\n", ret); + + params.window = window; + params.hwnd = our_hwnd; + params.message = WM_SYSCOLORCHANGE; + thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); + ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); + ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); + + PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE); + ok(!WaitForSingleObject(thread, 100), "Wait timed out.\n"); + CloseHandle(thread); + + params.message = WM_SETCURSOR; + thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); + ok(!WaitForSingleObject(thread, 100), "Thread should not block.\n"); + CloseHandle(thread); + ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); + ok(!ret, "Got unexpected status %#x.\n", ret); hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index be6646c27a..04132aaab1 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -654,14 +654,28 @@ HRESULT WINAPI BaseControlWindowImpl_GetWindowPosition(IVideoWindow *iface, LONG return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_NotifyOwnerMessage(IVideoWindow *iface, OAHWND hwnd, LONG uMsg, LONG_PTR wParam, LONG_PTR lParam) +HRESULT WINAPI BaseControlWindowImpl_NotifyOwnerMessage(IVideoWindow *iface, + OAHWND hwnd, LONG message, LONG_PTR wparam, LONG_PTR lparam) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); + BaseControlWindow *window = impl_from_IVideoWindow(iface); - TRACE("(%p/%p)->(%08lx, %d, %08lx, %08lx)\n", This, iface, hwnd, uMsg, wParam, lParam); + TRACE("window %p, hwnd %#lx, message %#x, wparam %#lx, lparam %#lx.\n", + window, hwnd, message, wparam, lparam); - if (!PostMessageW(This->baseWindow.hWnd, uMsg, wParam, lParam)) - return E_FAIL; + /* That these messages are forwarded, and no others, is stated by the + * DirectX documentation, and supported by manual testing. */ + switch (message) + { + case WM_ACTIVATEAPP: + case WM_DEVMODECHANGE: + case WM_DISPLAYCHANGE: + case WM_PALETTECHANGED: + case WM_PALETTEISCHANGING: + case WM_QUERYNEWPALETTE: + case WM_SYSCOLORCHANGE: + SendMessageW(window->baseWindow.hWnd, message, wparam, lparam); + break; + } return S_OK; } -- 2.24.0

2 6

[PATCH v4] odbccp32: Implement SQLConfigDataSource/W
by Alistair Leslie-Hughes Dec. 5, 2019

Dec. 5, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 121 +++++++++++++++++++++++++++++-------- dlls/odbccp32/tests/misc.c | 8 +-- 2 files changed, 101 insertions(+), 28 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index a09d6571f3..c842872fa6 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -68,6 +68,9 @@ static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i',' static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; static const WCHAR odbc_error_invalid_keyword[] = {'I','n','v','a','l','i','d',' ','k','e','y','w','o','r','d',' ','v','a','l','u','e',0}; +static BOOL (WINAPI *pConfigDSN)(HWND hwnd, WORD request, const char *driver, const char *attr); +static BOOL (WINAPI *pConfigDSNW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *attr); + /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) { @@ -219,30 +222,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng return success; } -BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, - LPCWSTR lpszDriver, LPCWSTR lpszAttributes) -{ - LPCWSTR p; - - clear_errors(); - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszAttributes)); - - for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) - FIXME("%s\n", debugstr_w(p)); - - return TRUE; -} - -BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, - LPCSTR lpszDriver, LPCSTR lpszAttributes) -{ - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszAttributes)); - clear_errors(); - return TRUE; -} - static HMODULE load_config_driver(const WCHAR *driver) { static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; @@ -359,6 +338,100 @@ fail: return FALSE; } +BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); + if (TRACE_ON(odbc)) + { + const WCHAR *p; + for (p = attributes; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + } + + clear_errors(); + + mod = load_config_driver(driver); + if (!mod) + return FALSE; + + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if(pConfigDSNW) + ret = pConfigDSNW(hwnd, request, driver, attributes); + else + ERR("Failed to find ConfigDSNW\n"); + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + FreeLibrary(mod); + + return ret; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + WCHAR *driverW; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); + + if (TRACE_ON(odbc)) + { + const char *p; + for (p = attributes; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + } + + clear_errors(); + + driverW = heap_strdupAtoW(driver); + if (!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + + mod = load_config_driver(driverW); + if (!mod) + { + heap_free(driverW); + return FALSE; + } + + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); + if (pConfigDSN) + { + TRACE("Calling ConfigDSN\n"); + ret = pConfigDSN(hwnd, request, driver, attributes); + } + else + { + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if (pConfigDSNW) + { + WCHAR *attr = NULL; + TRACE("Calling ConfigDSNW\n"); + + attr = SQLInstall_strdup_multi(attributes); + if(attr) + ret = pConfigDSNW(hwnd, request, driverW, attr); + heap_free(attr); + } + } + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + heap_free(driverW); + FreeLibrary(mod); + + return ret; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index e2f48ee732..0120504227 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -751,10 +751,10 @@ static void test_SQLConfigDataSource(void) BOOL ret; ret = SQLConfigDataSource(0, ODBC_ADD_DSN, "SQL Server", "DSN=WINEMQIS\0Database=MQIS\0\0"); - ok(ret, "got %d\n", ret); + todo_wine ok(ret, "got %d\n", ret); ret = SQLConfigDataSource(0, ODBC_REMOVE_DSN, "SQL Server", "DSN=WINEMQIS\0\0"); - ok(ret, "got %d\n", ret); + todo_wine ok(ret, "got %d\n", ret); ret = SQLConfigDataSource(0, ODBC_REMOVE_DSN, "SQL Server", "DSN=WINEMQIS\0\0"); if(!ret) @@ -767,8 +767,8 @@ static void test_SQLConfigDataSource(void) } ret = SQLConfigDataSource(0, ODBC_ADD_DSN, "ODBC driver", "DSN=ODBC data source\0\0"); - todo_wine ok(!ret, "got %d\n", ret); - todo_wine check_error(ODBC_ERROR_COMPONENT_NOT_FOUND); + ok(!ret, "got %d\n", ret); + check_error(ODBC_ERROR_COMPONENT_NOT_FOUND); } START_TEST(misc) -- 2.17.1

1 0

[PATCH v2 1/3] xmllite/tests: Extract nul-character test from XML declaration test.
by Jeff Smith Dec. 5, 2019

Dec. 5, 2019

The comments in the XML declaration test suggest that it is supposed to be to checking for failure when no element follows the XML declaration. However, the error being tested for is due to a nul character in the input stream. Create a separate test for nul-character errors, and fix the XML declaration test accordingly. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/xmllite/tests/reader.c | 83 +++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 17 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 41adad1598..40d39c22f5 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -863,7 +863,6 @@ static void test_read_xmldeclaration(void) { {'s','t','a','n','d','a','l','o','n','e',0}, {'y','e','s',0} } }; IXmlReader *reader; - IStream *stream; HRESULT hr; XmlNodeType type; UINT count = 0, len, i; @@ -873,10 +872,7 @@ static void test_read_xmldeclaration(void) hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - stream = create_stream_on_data(xmldecl_full, sizeof(xmldecl_full)); - - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + set_input_string(reader, xmldecl_full); hr = IXmlReader_GetAttributeCount(reader, &count); ok(hr == S_OK, "got %08x\n", hr); @@ -968,19 +964,19 @@ static void test_read_xmldeclaration(void) type = XmlNodeType_XmlDeclaration; hr = IXmlReader_Read(reader, &type); - /* newer versions return syntax error here cause document is incomplete, - it makes more sense than invalid char error */ + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Whitespace, "expected XmlNodeType_Whitespace, got %s\n", type_to_str(type)); + + type = XmlNodeType_Whitespace; + hr = IXmlReader_Read(reader, &type); todo_wine { - ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr); + ok(hr == WC_E_ROOTELEMENT, "got %08x\n", hr); ok(type == XmlNodeType_None, "got %d\n", type); + TEST_READER_STATE(reader, XmlReadState_Error); } - IStream_Release(stream); /* test short variant */ - stream = create_stream_on_data(xmldecl_short, sizeof(xmldecl_short)); - - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + set_input_string(reader, xmldecl_short); read_node(reader, XmlNodeType_XmlDeclaration); TEST_READER_POSITION2(reader, 1, 3, ~0u, 21); @@ -1027,14 +1023,66 @@ todo_wine { type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine - ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); + ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); - TEST_READER_POSITION(reader, 1, 41); + + IXmlReader_Release(reader); +} + +static void test_read_nul(void) +{ + static const char xml_empty[] = "<a/>"; + static const char xml_ws[] = "<a/> "; + static const char xml_comment[] = "<a/>"; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stream = create_stream_on_data(xml_empty, sizeof(xml_empty)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + IStream_Release(stream); + + read_node(reader, XmlNodeType_Element); + + type = -1; + hr = IXmlReader_Read(reader, &type); todo_wine - TEST_READER_STATE(reader, XmlReadState_Error); + ok(hr == WC_E_SYNTAX, "expected WC_E_SYNTAX, got 0x%08x\n", hr); + ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); + stream = create_stream_on_data(xml_ws, sizeof(xml_ws)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); IStream_Release(stream); + + read_node(reader, XmlNodeType_Element); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine { + ok(hr == WC_E_SYNTAX, "expected WC_E_SYNTAX, got 0x%08x\n", hr); + ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); +} + + stream = create_stream_on_data(xml_comment, sizeof(xml_comment)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + IStream_Release(stream); + + read_node(reader, XmlNodeType_Element); + read_node(reader, XmlNodeType_Comment); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine + ok(hr == WC_E_SYNTAX, "expected WC_E_SYNTAX, got 0x%08x\n", hr); + ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); + IXmlReader_Release(reader); } @@ -2672,6 +2720,7 @@ START_TEST(reader) test_read_pending(); test_readvaluechunk(); test_read_xmldeclaration(); + test_read_nul(); test_reader_properties(); test_prefix(); test_namespaceuri(); -- 2.23.0

1 2

[PATCH] kernel32: Set all %eax bits on Wow64EnableWow64FsRedirection return.
by Piotr Caban Dec. 5, 2019

Dec. 5, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47565 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- The Wow64EnableWow64FsRedirection function, when compiled with gcc 9.2.0, uses setz %al to set return value. Microsoft C++ Redistributable installers are depending on all %eax bits being set. dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/path.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)

1 0

[PATCH v3 1/3] bcrypt: Add support for signing hashes with ECDSA keys.
by Derek Lesho Dec. 5, 2019

Dec. 5, 2019

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v3: Fix accidental return of 0 (STATUS_SUCCESS) when gnutls_decode_rs_value fails. --- 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..6e0bfef97b 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 ))) + { + ERR( "failed to get R/S values from signature %u\n", 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 ) -- 2.24.0

1 0

[PATCH 1/3] bcrypt: Add support for signing hashes with ECDSA keys.
by Hans Leidekker Dec. 5, 2019

Dec. 5, 2019

From: Derek Lesho <dlesho(a)codeweavers.com> v2: Avoid goto within switch statement, formatting. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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..379d76a32e 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 ))) + { + ERR( "failed to get R/S values from signature %u\n", err ); + return 0; + } + + 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 ) -- 2.20.1

2 1

[PATCH] msxml3: all string passed to IXMLDOMDocument_load() need to be URL-unescaped
by Damjan Jovanovic Dec. 5, 2019

Dec. 5, 2019

msxml3 allows URL escape sequences even for C:\ style paths. eg. C:\Program%20Files\... Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/msxml3/bsc.c | 8 ++++++-- dlls/msxml3/tests/domdoc.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-)

2 2

[PATCH] mscoree: Ignore empty privatePath.
by Vincent Povirk Dec. 5, 2019

Dec. 5, 2019

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- Spotted by Rafał Mużyło. dlls/mscoree/corruntimehost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index e932a7f58be..a900ed6a3e2 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1478,7 +1478,7 @@ __int32 WINAPI _CorExeMain(void) wcscat(config_file, dotconfig); hr = parse_config_file(config_file, &parsed_config); - if (SUCCEEDED(hr) && parsed_config.private_path) + if (SUCCEEDED(hr) && parsed_config.private_path && parsed_config.private_path[0]) { for(i = 0; parsed_config.private_path[i] != 0; i++) if (parsed_config.private_path[i] == ';') number_of_private_paths++; -- 2.17.1

1 0

mscoree: fix an error in string access
by Rafał Mużyło Dec. 5, 2019

Dec. 5, 2019

mscoree: fix an error in string access If parsed_config.private_path is an empty string, wine is doing a Bad Thing. It shouldn't. Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl>

2 1

[PATCH] jscript: Import to_int32 implementation from WebKit.
by Jacek Caban Dec. 5, 2019

Dec. 5, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsutils.c | 63 +++++++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 13 deletions(-)

1 0