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

[PATCH 2/3] chcp: Return the active code page when called without arguments.
by Erich E. Hoover 10 Dec '19

10 Dec '19

After doing some sleuthing on MSDN, chcp treats the input console code page as the "active" code page (GetConsoleCP instead of GetACP). This will appease applications that expect chcp to return the "active" console code page. Best, Erich

1 0

[PATCH v3 1/3] chcp: Add a stub application for changing the codepage.
by Erich E. Hoover 10 Dec '19

10 Dec '19

v3: Fix makefile mistake in v2 v2: The executable is called chcp.com even though it's a PE file (thanks Zeb!) Anaconda expects to be able to call chcp to get/set the console codepage. Adding a stub application is sufficient to appease it. Best, Erich

1 0

[PATCH] mshtml: Update to Wine Gecko 2.47.1.
by Jacek Caban 10 Dec '19

10 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The new release is more of a refreshment, bringing compatibility with modern build environments. The biggest change is build system port to python3 by Vincent. This involved changes across the whole build system, thanks Vincent! It's packaged slightly differently. There are archives that contain Wine Gecko build. It may be used for system-wide installations. Users may just unpack the package into /usr/share/wine/gecko/, /opt/wine/gecko, etc. and it should work without in-prefix installation as long as it has a valid dos drive (we should be able to support non-mapped locations in the future as well, but it needs Gecko fixes first). It's just like Wine Mono does it for a while. The release also brings improved compatibility with IE clipboard format. Executable files are marked as nxcompat. It also contains a number of portability fixes for recent GCC versions. It should work with both winpthread and non-winpthread toolchains now. I hoped to include a few more changes in this release, but I don't think it's worth delaying it any more. dlls/appwiz.cpl/addons.c | 8 ++++---- dlls/mshtml/nsiface.idl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)

2 1

Re: [PATCH] mshtml: Update to Wine Gecko 2.47.1.
by Marvin 10 Dec '19

10 Dec '19

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=61793 Your paranoid android. === debian10 (32 bit report) === mshtml: activex: Timeout dom: Timeout events: Timeout htmldoc: Timeout htmllocation: Timeout === debian10 (build log) === Task errors: The task timed out === debian10 (32 bit WoW report) === mshtml: activex: Timeout dom: Timeout events: Timeout htmldoc: Timeout htmllocation: Timeout === debian10 (build log) === Task errors: The task timed out

1 0

[PATCH 1/4] oleaut32/typelib: Get rid of redundant argument in typeinfo lookup helper.
by Nikolay Sivov 10 Dec '19

10 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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; -- 2.24.0

1 3

[PATCH] ieframe: implement COM aggregation in WebBrowser
by Jacek Caban 10 Dec '19

10 Dec '19

From: Damjan Jovanovic <damjan.jov(a)gmail.com> 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> --- 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(-)

1 0

[PATCH 5/5] msado15: Implement _Stream_ReadText and _Stream_WriteText.
by Hans Leidekker 10 Dec '19

10 Dec '19

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

2 2

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

10 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48254 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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()); -- 2.20.1

1 0

[PATCH 2/5] msado15: Implement _Stream_get_LineSeparator and _Stream_put_LineSeparator.
by Hans Leidekker 10 Dec '19

10 Dec '19

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

2 1

[PATCH 2/2] msado15: Implement Connection get/put CommandTimeout
by Alistair Leslie-Hughes 10 Dec '19

10 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 14 ++++++++++---- dlls/msado15/tests/msado15.c | 13 ++++++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index dbf0b03149..ef589ecb7d 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -36,6 +36,7 @@ struct connection LONG refs; ObjectStateEnum state; + LONG timeout; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -126,14 +127,18 @@ static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) { - FIXME( "%p, %p\n", iface, timeout ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, timeout ); + *timeout = connection->timeout; + return S_OK; } static HRESULT WINAPI connection_put_CommandTimeout( _Connection *iface, LONG timeout ) { - FIXME( "%p, %d\n", iface, timeout ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %d\n", connection, timeout ); + connection->timeout = timeout; + return S_OK; } static HRESULT WINAPI connection_get_ConnectionTimeout( _Connection *iface, LONG *timeout ) @@ -342,6 +347,7 @@ HRESULT Connection_create( void **obj ) connection->Connection_iface.lpVtbl = &connection_vtbl; connection->refs = 1; connection->state = adStateClosed; + connection->timeout = 30; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index f2c9789576..bb356ae5a8 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -197,7 +197,7 @@ static void test_connection(void) _Connection *connection; IRunnableObject *runtime; ISupportErrorInfo *errorinfo; - LONG state; + LONG state, timeout; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -220,6 +220,17 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state); + hr = _Connection_get_CommandTimeout(connection, &timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(timeout == 30, "Unexpected timeout value %d\n", timeout); + + hr = _Connection_put_CommandTimeout(connection, 300); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + + hr = _Connection_get_CommandTimeout(connection, &timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + _Connection_Release(connection); } -- 2.24.0

1 0