December 2019 - Wine-commits

Francois Gouget : msado15: Fix the name of the GetString() delimiter parameters.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 4d5e1f07ef145872d406231c2e83a39405c6dc89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d5e1f07ef145872d406231c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 10 09:24:13 2019 +0100 msado15: Fix the name of the GetString() delimiter parameters. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 6 +++--- include/msado15_backcompat.idl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 52282c7e82..84adec406f 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -526,11 +526,11 @@ static HRESULT WINAPI recordset_get_StayInSync( _Recordset *iface, VARIANT_BOOL } static HRESULT WINAPI recordset_GetString( _Recordset *iface, StringFormatEnum string_format, LONG num_rows, - BSTR column_delimeter, BSTR row_delimeter, BSTR null_expr, + BSTR column_delimiter, BSTR row_delimiter, 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 ); + FIXME( "%p, %u, %d, %s, %s, %s, %p\n", iface, string_format, num_rows, debugstr_w(column_delimiter), + debugstr_w(row_delimiter), debugstr_w(null_expr), ret_string ); return E_NOTIMPL; } diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index a1d5e28038..e4a847ab85 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -1068,8 +1068,8 @@ interface Recordset20 : Recordset15 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 column_delimiter, + [in, optional] BSTR row_delimiter, [in, optional] BSTR null_expr, [out, retval] BSTR *ret_string);

1 0

Hans Leidekker : msado15: Implement _Stream_get_EOS.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 74410ebb26b3a3bed7b178dd5a84aa70e3298f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=74410ebb26b3a3bed7b178dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 10 11:11:19 2019 +0100 msado15: Implement _Stream_get_EOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/stream.c | 9 +++++++-- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 169be7319e..9fb6007b57 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -124,8 +124,13 @@ static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) { - FIXME( "%p, %p\n", iface, eos ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, eos ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + *eos = (stream->pos >= stream->size) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1755a7f3da..0b10579905 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -49,6 +49,7 @@ static HRESULT str_to_byte_array( const char *data, VARIANT *ret ) static void test_Stream(void) { _Stream *stream; + VARIANT_BOOL eos; StreamTypeEnum type; LONG refs, size, pos; ObjectStateEnum state; @@ -61,6 +62,9 @@ static void test_Stream(void) hr = _Stream_get_Size( stream, &size ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + hr = _Stream_get_EOS( stream, &eos ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + hr = _Stream_get_Position( stream, &pos ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); @@ -111,6 +115,11 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !size, "got %d\n", size ); + eos = VARIANT_FALSE; + hr = _Stream_get_EOS( stream, &eos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( eos == VARIANT_TRUE, "got %04x\n", eos ); + pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Hans Leidekker : msado15: Implement _Stream_get_LineSeparator and _Stream_put_LineSeparator.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: ada885fe510a3ad6e940fa011525040c797572f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ada885fe510a3ad6e940fa01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 10 11:11:20 2019 +0100 msado15: Implement _Stream_get_LineSeparator and _Stream_put_LineSeparator. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/stream.c | 32 ++++++++++++++++++++------------ dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 9fb6007b57..07027f3829 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -32,14 +32,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct stream { - _Stream Stream_iface; - LONG refs; - ObjectStateEnum state; - StreamTypeEnum type; - LONG size; - LONG allocated; - LONG pos; - BYTE *buf; + _Stream Stream_iface; + LONG refs; + ObjectStateEnum state; + StreamTypeEnum type; + LineSeparatorEnum sep; + LONG size; + LONG allocated; + LONG pos; + BYTE *buf; }; static inline struct stream *impl_from_Stream( _Stream *iface ) @@ -193,14 +194,20 @@ static HRESULT WINAPI stream_put_Type( _Stream *iface, StreamTypeEnum type ) static HRESULT WINAPI stream_get_LineSeparator( _Stream *iface, LineSeparatorEnum *sep ) { - FIXME( "%p, %p\n", iface, sep ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, sep ); + + *sep = stream->sep; + return S_OK; } static HRESULT WINAPI stream_put_LineSeparator( _Stream *iface, LineSeparatorEnum sep ) { - FIXME( "%p, %d\n", iface, sep ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %d\n", stream, sep ); + + stream->sep = sep; + return S_OK; } static HRESULT WINAPI stream_get_State( _Stream *iface, ObjectStateEnum *state ) @@ -431,6 +438,7 @@ HRESULT Stream_create( void **obj ) stream->Stream_iface.lpVtbl = &stream_vtbl; stream->refs = 1; stream->type = adTypeText; + stream->sep = adCRLF; *obj = &stream->Stream_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 0b10579905..a4de15932d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -51,6 +51,7 @@ static void test_Stream(void) _Stream *stream; VARIANT_BOOL eos; StreamTypeEnum type; + LineSeparatorEnum sep; LONG refs, size, pos; ObjectStateEnum state; VARIANT missing, val; @@ -89,6 +90,14 @@ static void test_Stream(void) hr = _Stream_put_Type( stream, adTypeText ); ok( hr == S_OK, "got %08x\n", hr ); + sep = 0; + hr = _Stream_get_LineSeparator( stream, &sep ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( sep == adCRLF, "got %d\n", sep ); + + hr = _Stream_put_LineSeparator( stream, adLF ); + ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; hr = _Stream_get_State( stream, &state ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Hans Leidekker : msado15: Implement _Stream_get_Mode and _Stream_put_Mode.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: c66411f742b417de80d2c331c30ebae04dde71f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c66411f742b417de80d2c331… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 10 11:11:21 2019 +0100 msado15: Implement _Stream_get_Mode and _Stream_put_Mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/stream.c | 15 +++++++++++---- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 07027f3829..9aa35d5831 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -35,6 +35,7 @@ struct stream _Stream Stream_iface; LONG refs; ObjectStateEnum state; + ConnectModeEnum mode; StreamTypeEnum type; LineSeparatorEnum sep; LONG size; @@ -221,14 +222,20 @@ static HRESULT WINAPI stream_get_State( _Stream *iface, ObjectStateEnum *state ) static HRESULT WINAPI stream_get_Mode( _Stream *iface, ConnectModeEnum *mode ) { - FIXME( "%p, %p\n", iface, mode ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, mode ); + + *mode = stream->mode; + return S_OK; } static HRESULT WINAPI stream_put_Mode( _Stream *iface, ConnectModeEnum mode ) { - FIXME( "%p, %u\n", iface, mode ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %u\n", stream, mode ); + + stream->mode = mode; + return S_OK; } static HRESULT WINAPI stream_get_Charset( _Stream *iface, BSTR *charset ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a4de15932d..6aab518da9 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -54,6 +54,7 @@ static void test_Stream(void) LineSeparatorEnum sep; LONG refs, size, pos; ObjectStateEnum state; + ConnectModeEnum mode; VARIANT missing, val; HRESULT hr; @@ -103,6 +104,14 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateClosed, "got %u\n", state ); + mode = 0xdeadbeef; + hr = _Stream_get_Mode( stream, &mode ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( mode == adModeUnknown, "got %u\n", mode ); + + hr = _Stream_put_Mode( stream, adModeReadWrite ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr );

1 0

Hans Leidekker : msado15: Implement _Stream_get_Charset and _Stream_put_Charset.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 3e6b9394bc9650928a24bd2ec8890574b46b7280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6b9394bc9650928a24bd2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 10 11:11:22 2019 +0100 msado15: Implement _Stream_get_Charset and _Stream_put_Charset. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/msado15_private.h | 8 ++++++++ dlls/msado15/stream.c | 24 ++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 11 +++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 1078cbf64e..7239e48b53 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -31,4 +31,12 @@ static inline void *heap_realloc_zero( void *mem, SIZE_T len ) return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); } +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(*dst) ))) lstrcpyW( dst, src ); + return dst; +} + #endif /* _WINE_MSADO15_PRIVATE_H_ */ diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 9aa35d5831..e2e404a620 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -38,6 +38,7 @@ struct stream ConnectModeEnum mode; StreamTypeEnum type; LineSeparatorEnum sep; + WCHAR *charset; LONG size; LONG allocated; LONG pos; @@ -62,6 +63,7 @@ static ULONG WINAPI stream_Release( _Stream *iface ) if (!refs) { TRACE( "destroying %p\n", stream ); + heap_free( stream->charset ); heap_free( stream->buf ); heap_free( stream ); } @@ -240,14 +242,28 @@ static HRESULT WINAPI stream_put_Mode( _Stream *iface, ConnectModeEnum mode ) static HRESULT WINAPI stream_get_Charset( _Stream *iface, BSTR *charset ) { - FIXME( "%p, %p\n", iface, charset ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + const WCHAR *src = stream->charset ? stream->charset : L"Unicode"; + BSTR dst; + + TRACE( "%p, %p\n", stream, charset ); + + if (!(dst = SysAllocString( src ))) return E_OUTOFMEMORY; + *charset = dst; + return S_OK; } static HRESULT WINAPI stream_put_Charset( _Stream *iface, BSTR charset ) { - FIXME( "%p, %s\n", iface, debugstr_w(charset) ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + WCHAR *str; + + TRACE( "%p, %s\n", stream, debugstr_w(charset) ); + + if (!(str = strdupW( charset ))) return E_OUTOFMEMORY; + heap_free( stream->charset ); + stream->charset = str; + return S_OK; } static HRESULT create_byte_array( BYTE *data, LONG len, VARIANT *ret ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 6aab518da9..2c75904837 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -55,6 +55,7 @@ static void test_Stream(void) LONG refs, size, pos; ObjectStateEnum state; ConnectModeEnum mode; + BSTR charset, str; VARIANT missing, val; HRESULT hr; @@ -112,6 +113,16 @@ static void test_Stream(void) hr = _Stream_put_Mode( stream, adModeReadWrite ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_get_Charset( stream, &charset ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( charset, L"Unicode" ), "got %s\n", wine_dbgstr_w(charset) ); + SysFreeString( charset ); + + str = SysAllocString( L"Unicode" ); + hr = _Stream_put_Charset( stream, str ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( str ); + hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr );

1 0

Hans Leidekker : msado15: Implement _Stream_ReadText and _Stream_WriteText.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 65200440fdd022451fe682f1947fb1b99af933bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=65200440fdd022451fe682f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 10 11:11:23 2019 +0100 msado15: Implement _Stream_ReadText and _Stream_WriteText. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/stream.c | 58 +++++++++++++++++++++++++++++++++++++++++--- dlls/msado15/tests/msado15.c | 51 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index e2e404a620..52f35afe3c 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -400,14 +400,64 @@ static HRESULT WINAPI stream_LoadFromFile( _Stream *iface, BSTR filename ) static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret ) { - FIXME( "%p, %d, %p\n", iface, len, ret ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + BSTR str; + + TRACE( "%p, %d, %p\n", stream, len, ret ); + if (len == adReadLine) + { + FIXME( "adReadLine not supported\n" ); + return E_NOTIMPL; + } + if (stream->charset && wcscmp( stream->charset, L"Unicode" )) + { + FIXME( "charset %s not supported\n", debugstr_w(stream->charset) ); + return E_NOTIMPL; + } + + if (stream->type != adTypeText) return MAKE_ADO_HRESULT( adErrIllegalOperation ); + if (len < adReadLine) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + if (len == adReadAll) len = (stream->size - stream->pos) / sizeof(WCHAR); + else len = min( len, stream->size - stream->pos / sizeof(WCHAR) ); + + if (!(str = SysAllocStringLen( NULL, len ))) return E_OUTOFMEMORY; + memcpy( str, stream->buf + stream->pos, len * sizeof(WCHAR) ); + str[len] = 0; + + stream->pos += len * sizeof(WCHAR); + + *ret = str; + return S_OK; } static HRESULT WINAPI stream_WriteText( _Stream *iface, BSTR data, StreamWriteEnum options ) { - FIXME( "%p, %s, %u\n", iface, debugstr_w(data), options ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + HRESULT hr; + LONG size; + + TRACE( "%p, %s, %u\n", stream, debugstr_w(data), options ); + if (options != adWriteChar) + { + FIXME( "options %u not supported\n", options ); + return E_NOTIMPL; + } + if (stream->charset && wcscmp( stream->charset, L"Unicode" )) + { + FIXME( "charset %s not supported\n", debugstr_w(stream->charset) ); + return E_NOTIMPL; + } + + if (stream->type != adTypeText) return MAKE_ADO_HRESULT( adErrIllegalOperation ); + + size = (lstrlenW( data ) + 1) * sizeof(WCHAR); + if ((hr = resize_buffer( stream, stream->size + size )) != S_OK) return hr; + + memcpy( stream->buf + stream->pos, data, size ); + stream->pos += size; + + return S_OK; } static HRESULT WINAPI stream_Cancel( _Stream *iface ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 2c75904837..079da0a103 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -162,11 +162,54 @@ static void test_Stream(void) hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + hr = _Stream_ReadText( stream, 2, &str ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !str[0], "got %s\n", wine_dbgstr_w(str) ); + SysFreeString( str ); + pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); ok( !pos, "got %d\n", pos ); + str = SysAllocString( L"test" ); + hr = _Stream_WriteText( stream, str, adWriteChar ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( str ); + + hr = _Stream_ReadText( stream, adReadAll, &str ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !str[0], "got %s\n", wine_dbgstr_w(str) ); + SysFreeString( str ); + + hr = _Stream_put_Position( stream, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_ReadText( stream, adReadAll, &str ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( str, L"test" ), "got %s\n", wine_dbgstr_w(str) ); + SysFreeString( str ); + + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos == 10, "got %d\n", pos ); + + eos = VARIANT_FALSE; + hr = _Stream_get_EOS( stream, &eos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( eos == VARIANT_TRUE, "got %04x\n", eos ); + + hr = _Stream_put_Position( stream, 6 ); + ok( hr == S_OK, "got %08x\n", hr ); + + size = -1; + hr = _Stream_get_Size( stream, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( size == 10, "got %d\n", size ); + + hr = _Stream_put_Position( stream, 2 ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr ); @@ -191,6 +234,14 @@ static void test_Stream(void) hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_ReadText( stream, adReadAll, &str ); + ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + + str = SysAllocString( L"test" ); + hr = _Stream_WriteText( stream, str, adWriteChar ); + ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + SysFreeString( str ); + VariantInit( &val ); hr = _Stream_Read( stream, 1, &val ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Hans Leidekker : winhttp/tests: Show that WINHTTP_OPTION_SECURE_PROTOCOLS can't be set on connection handles.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 2c708d8d9c7b3e4b9886303bc3af3175ce74283b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c708d8d9c7b3e4b9886303b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 10 12:12:38 2019 +0100 winhttp/tests: Show that WINHTTP_OPTION_SECURE_PROTOCOLS can't be set on connection handles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48254 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e4c614cb10..3e0e8baeb9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1070,6 +1070,13 @@ static void test_secure_connection(void) con = WinHttpConnect(ses, test_winehq, 443, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + SetLastError( 0xdeadbeef ); + protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; + ret = WinHttpSetOption(con, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", err); + /* try without setting WINHTTP_FLAG_SECURE */ req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError());

1 0

Damjan Jovanovic : ieframe: Implement COM aggregation in WebBrowser.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: a14281c08969927adcdd52de8a19605448baa5bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a14281c08969927adcdd52de… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Dec 10 13:44:44 2019 +0100 ieframe: Implement COM aggregation in WebBrowser. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12406 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/classinfo.c | 6 ++-- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/oleobject.c | 30 ++++++++-------- dlls/ieframe/persist.c | 18 +++++----- dlls/ieframe/tests/webbrowser.c | 60 +++++++++++++++++++++++++++++++ dlls/ieframe/view.c | 12 +++---- dlls/ieframe/webbrowser.c | 78 ++++++++++++++++++++++++++++++----------- 7 files changed, 151 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a14281c08969927adcdd…

1 0

Gabriel Ivăncescu : vbscript: Remove unused field.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 2dfcb31cf38e352dbdbfccd227709fb796ae8479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dfcb31cf38e352dbdbfccd2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 10 15:41:41 2019 +0200 vbscript: Remove unused field. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 3 --- dlls/vbscript/vbscript.h | 1 - 2 files changed, 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index d8ae0fc313..c76ba73bd8 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1980,9 +1980,6 @@ HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *d desc->func_cnt = 1; desc->funcs->entries[VBDISP_CALLGET] = &code->main_code; - desc->next = script->script_obj->procs; - script->script_obj->procs = desc; - *ret = desc; return S_OK; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d79be9e6e7..19431e23c3 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -141,7 +141,6 @@ typedef struct { size_t global_funcs_size; class_desc_t *classes; - class_desc_t *procs; script_ctx_t *ctx; heap_pool_t heap;

1 0

Nikolay Sivov : oleaut32/typelib: Get rid of redundant argument in typeinfo lookup helper.
by Alexandre Julliard 10 Dec '19

10 Dec '19

Module: wine Branch: master Commit: 5d05d4acd696ea4f2a503d35a269959a7d5f115d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d05d4acd696ea4f2a503d35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 10 16:49:03 2019 +0300 oleaut32/typelib: Get rid of redundant argument in typeinfo lookup helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 668ad8d582..f490795cc7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1724,15 +1724,16 @@ static inline TLBCustData *TLB_get_custdata_by_guid(struct list *custdata_list, return NULL; } -static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeInfoImpl **typeinfos, - UINT n, const OLECHAR *name) +static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeLibImpl *typelib, const OLECHAR *name) { - while(n){ - if(!lstrcmpiW(TLB_get_bstr((*typeinfos)->Name), name)) - return *typeinfos; - ++typeinfos; - --n; + int i; + + for (i = 0; i < typelib->TypeInfoCount; ++i) + { + if (!lstrcmpiW(TLB_get_bstr(typelib->typeinfos[i]->Name), name)) + return typelib->typeinfos[i]; } + return NULL; } @@ -5507,7 +5508,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( if(!szName || !ppTInfo || !ppTComp) return E_INVALIDARG; - info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, szName); + info = TLB_get_typeinfo_by_name(This, szName); if(!info){ *ppTInfo = NULL; *ppTComp = NULL; @@ -9007,7 +9008,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface, if (!ctinfo || !name) return E_INVALIDARG; - info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, name); + info = TLB_get_typeinfo_by_name(This, name); if (info) return TYPE_E_NAMECONFLICT;

1 0