May 2017 - Wine-commits - list.winehq.org

Hans Leidekker : webservices: Implement WsReadAttribute.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 9f52fec0d81bfc36d2ad5f04f4267be44bb1304c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f52fec0d81bfc36d2ad5f04f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 10 14:26:17 2017 +0200 webservices: Implement WsReadAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 36 ++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 53 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index d53b330..0cfc844 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4423,6 +4423,42 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi return hr; } +/************************************************************************** + * WsReadAttribute [webservices.@] + */ +HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRIPTION *desc, + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size, + WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + HRESULT hr; + + TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader || !desc || !value) return E_INVALIDARG; + + EnterCriticalSection( &reader->cs ); + + if (reader->magic != READER_MAGIC) + { + LeaveCriticalSection( &reader->cs ); + return E_INVALIDARG; + } + + if (!reader->input_type) + { + LeaveCriticalSection( &reader->cs ); + return WS_E_INVALID_OPERATION; + } + + hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->attributeLocalName, + desc->attributeNs, desc->typeDescription, option, heap, value, size ); + + LeaveCriticalSection( &reader->cs ); + return hr; +} + static inline BOOL is_utf8( const unsigned char *data, ULONG size, ULONG *offset ) { static const char bom[] = {0xef,0xbb,0xbf}; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1fe37c5..1598cb2 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4351,6 +4351,58 @@ static void test_WsReadQualifiedName(void) WsFreeReader( reader ); } +static void test_WsReadAttribute(void) +{ + WS_XML_STRING localname = {1, (BYTE *)"a"}, ns = {0, NULL}; + WS_XML_READER *reader; + WS_ATTRIBUTE_DESCRIPTION desc; + WS_HEAP *heap; + UINT32 *val; + BOOL found; + HRESULT hr; + + hr = WsReadAttribute( NULL, NULL, 0, NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadAttribute( reader, NULL, 0, NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + desc.attributeLocalName = &localname; + desc.attributeNs = &ns; + desc.type = WS_UINT32_TYPE; + desc.typeDescription = NULL; + hr = WsReadAttribute( reader, &desc, 0, NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadAttribute( reader, &desc, WS_READ_REQUIRED_POINTER, NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 8, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadAttribute( reader, &desc, WS_READ_REQUIRED_POINTER, heap, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadAttribute( reader, &desc, WS_READ_REQUIRED_POINTER, heap, &val, sizeof(val), NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t a='1'>" ); + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + val = NULL; + hr = WsReadAttribute( reader, &desc, WS_READ_REQUIRED_POINTER, heap, &val, sizeof(val), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val != NULL, "val not set\n" ); + ok( *val == 1, "got %u\n", *val ); + + WsFreeHeap( heap ); + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -4391,4 +4443,5 @@ START_TEST(reader) test_WsReadChars(); test_WsReadCharsUtf8(); test_WsReadQualifiedName(); + test_WsReadAttribute(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 728457c..a6b8452 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -102,7 +102,7 @@ @ stub WsPullBytes @ stub WsPushBytes @ stub WsReadArray -@ stub WsReadAttribute +@ stdcall WsReadAttribute(ptr ptr long ptr ptr long ptr) @ stdcall WsReadBody(ptr ptr long ptr ptr long ptr) @ stdcall WsReadBytes(ptr ptr long ptr ptr) @ stdcall WsReadChars(ptr ptr long ptr ptr)

1 0

Hans Leidekker : webservices: Don' t trace output parameters in WsReadQualifiedName.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: f541c826123c228496fba158e69c0e4b982f6534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f541c826123c228496fba158e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 10 14:26:16 2017 +0200 webservices: Don't trace output parameters in WsReadQualifiedName. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9b0fd60..d53b330 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2214,8 +2214,7 @@ HRESULT WINAPI WsReadQualifiedName( WS_XML_READER *handle, WS_HEAP *heap, WS_XML struct reader *reader = (struct reader *)handle; HRESULT hr; - TRACE( "%p %p %s %s %s %p\n", handle, heap, debugstr_xmlstr(prefix), debugstr_xmlstr(localname), - debugstr_xmlstr(ns), error ); + TRACE( "%p %p %p %p %p %p\n", handle, heap, prefix, localname, ns, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!reader || !heap) return E_INVALIDARG;

1 0

Hans Leidekker : webservices: Allow listeners to be cancelled.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 350cf6654e186d52a1ebbf4cc1a7fcc20567a7e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=350cf6654e186d52a1ebbf4cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 10 14:26:15 2017 +0200 webservices: Allow listeners to be cancelled. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 77 +++++++++++++++++++++++++++++++-------- dlls/webservices/listener.c | 48 +++++++++++++++++++----- dlls/webservices/sock.h | 4 +- dlls/webservices/tests/listener.c | 3 ++ 4 files changed, 105 insertions(+), 27 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index aa78d1e..9fb1944 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1168,9 +1168,42 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ return hr; } -HRESULT channel_accept_tcp( SOCKET socket, WS_CHANNEL *handle ) +static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *ret ) +{ + HANDLE handles[] = { wait, cancel }; + ULONG nonblocking = 0; + HRESULT hr = S_OK; + + if (WSAEventSelect( socket, handles[0], FD_ACCEPT )) return HRESULT_FROM_WIN32( WSAGetLastError() ); + + switch (WSAWaitForMultipleEvents( 2, handles, FALSE, WSA_INFINITE, FALSE )) + { + case 0: + if ((*ret = accept( socket, NULL, NULL )) != -1) + { + WSAEventSelect( *ret, NULL, 0 ); + ioctlsocket( *ret, FIONBIO, &nonblocking ); + break; + } + hr = HRESULT_FROM_WIN32( WSAGetLastError() ); + break; + + case 1: + hr = WS_E_OPERATION_ABORTED; + break; + + default: + hr = HRESULT_FROM_WIN32( WSAGetLastError() ); + break; + } + + return hr; +} + +HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNEL *handle ) { struct channel *channel = (struct channel *)handle; + HRESULT hr; EnterCriticalSection( &channel->cs ); @@ -1180,27 +1213,41 @@ HRESULT channel_accept_tcp( SOCKET socket, WS_CHANNEL *handle ) return E_INVALIDARG; } - if ((channel->u.tcp.socket = accept( socket, NULL, NULL )) == -1) - { - LeaveCriticalSection( &channel->cs ); - return HRESULT_FROM_WIN32( WSAGetLastError() ); - } + hr = sock_accept( socket, wait, cancel, &channel->u.tcp.socket ); LeaveCriticalSection( &channel->cs ); - return S_OK; + return hr; } -static HRESULT sock_wait( SOCKET socket ) +static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel ) { - fd_set read; + HANDLE handles[] = { wait, cancel }; + ULONG nonblocking = 0; + HRESULT hr; - FD_ZERO( &read ); - FD_SET( socket, &read ); - if (select( socket + 1, &read, NULL, NULL, NULL ) < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); - return S_OK; + if (WSAEventSelect( socket, handles[0], FD_READ )) return HRESULT_FROM_WIN32( WSAGetLastError() ); + + switch (WSAWaitForMultipleEvents( 2, handles, FALSE, WSA_INFINITE, FALSE )) + { + case 0: + hr = S_OK; + break; + + case 1: + hr = WS_E_OPERATION_ABORTED; + break; + + default: + hr = HRESULT_FROM_WIN32( WSAGetLastError() ); + break; + } + + WSAEventSelect( socket, NULL, 0 ); + ioctlsocket( socket, FIONBIO, &nonblocking ); + return hr; } -HRESULT channel_accept_udp( SOCKET socket, WS_CHANNEL *handle ) +HRESULT channel_accept_udp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNEL *handle ) { struct channel *channel = (struct channel *)handle; HRESULT hr; @@ -1213,7 +1260,7 @@ HRESULT channel_accept_udp( SOCKET socket, WS_CHANNEL *handle ) return E_INVALIDARG; } - if ((hr = sock_wait( socket )) == S_OK) channel->u.udp.socket = socket; + if ((hr = sock_wait( socket, wait, cancel )) == S_OK) channel->u.udp.socket = socket; LeaveCriticalSection( &channel->cs ); return hr; diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 7d49b73..5d6d1a8 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -75,6 +75,9 @@ struct listener WS_CHANNEL_TYPE type; WS_CHANNEL_BINDING binding; WS_LISTENER_STATE state; + HANDLE wait; + HANDLE cancel; + WS_CHANNEL *channel; union { struct @@ -100,7 +103,18 @@ static struct listener *alloc_listener(void) if (!(ret = heap_alloc_zero( size ))) return NULL; - ret->magic = LISTENER_MAGIC; + ret->magic = LISTENER_MAGIC; + if (!(ret->wait = CreateEventW( NULL, FALSE, FALSE, NULL ))) + { + heap_free( ret ); + return NULL; + } + if (!(ret->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ))) + { + CloseHandle( ret->wait ); + heap_free( ret ); + return NULL; + } InitializeCriticalSection( &ret->cs ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": listener.cs"); @@ -112,6 +126,8 @@ static struct listener *alloc_listener(void) static void reset_listener( struct listener *listener ) { listener->state = WS_LISTENER_STATE_CREATED; + SetEvent( listener->cancel ); + listener->channel = NULL; switch (listener->binding) { @@ -132,6 +148,10 @@ static void reset_listener( struct listener *listener ) static void free_listener( struct listener *listener ) { reset_listener( listener ); + + CloseHandle( listener->wait ); + CloseHandle( listener->cancel ); + listener->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &listener->cs ); heap_free( listener ); @@ -569,7 +589,8 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, WS_ERROR *error ) { struct listener *listener = (struct listener *)handle; - HRESULT hr; + HRESULT hr = E_NOTIMPL; + HANDLE wait, cancel; TRACE( "%p %p %p %p\n", handle, channel_handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -585,27 +606,34 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, return E_INVALIDARG; } - if (listener->state != WS_LISTENER_STATE_OPEN) + if (listener->state != WS_LISTENER_STATE_OPEN || listener->channel) { LeaveCriticalSection( &listener->cs ); return WS_E_INVALID_OPERATION; } + wait = listener->wait; + cancel = listener->cancel; + listener->channel = channel_handle; + switch (listener->binding) { case WS_TCP_CHANNEL_BINDING: - hr = channel_accept_tcp( listener->u.tcp.socket, channel_handle ); - break; + { + SOCKET socket = listener->u.tcp.socket; + LeaveCriticalSection( &listener->cs ); + return channel_accept_tcp( socket, wait, cancel, channel_handle ); + } case WS_UDP_CHANNEL_BINDING: - /* hand over socket on success */ - if ((hr = channel_accept_udp( listener->u.udp.socket, channel_handle )) == S_OK) - listener->u.udp.socket = -1; - break; + { + SOCKET socket = listener->u.udp.socket; + LeaveCriticalSection( &listener->cs ); + return channel_accept_udp( socket, wait, cancel, channel_handle ); + } default: FIXME( "listener binding %u not supported\n", listener->binding ); - hr = E_NOTIMPL; break; } diff --git a/dlls/webservices/sock.h b/dlls/webservices/sock.h index 6b30f64..e03b91e 100644 --- a/dlls/webservices/sock.h +++ b/dlls/webservices/sock.h @@ -20,5 +20,5 @@ void winsock_init(void) DECLSPEC_HIDDEN; HRESULT resolve_hostname( const WCHAR *, USHORT, struct sockaddr *, int * ) DECLSPEC_HIDDEN; -HRESULT channel_accept_tcp( SOCKET, WS_CHANNEL * ) DECLSPEC_HIDDEN; -HRESULT channel_accept_udp( SOCKET, WS_CHANNEL * ) DECLSPEC_HIDDEN; +HRESULT channel_accept_tcp( SOCKET, HANDLE, HANDLE, WS_CHANNEL * ) DECLSPEC_HIDDEN; +HRESULT channel_accept_udp( SOCKET, HANDLE, HANDLE, WS_CHANNEL * ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/tests/listener.c b/dlls/webservices/tests/listener.c index 929b197..10539f9 100644 --- a/dlls/webservices/tests/listener.c +++ b/dlls/webservices/tests/listener.c @@ -282,6 +282,9 @@ static DWORD CALLBACK listener_proc( void *arg ) hr = WsAcceptChannel( listener, channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = WsAcceptChannel( listener, channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Hans Leidekker : iphlpapi: Return a fully initialized GUID from ConvertInterfaceLuidToGuid.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: c6e469347c1964dfa64a2e2289ad28c4be7ef9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e469347c1964dfa64a2e228… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 10 14:27:35 2017 +0200 iphlpapi: Return a fully initialized GUID from ConvertInterfaceLuidToGuid. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 1407bfb..b40f91b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3090,6 +3090,7 @@ DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID *luid, GUID *guid) row.dwIndex = luid->Info.NetLuidIndex; if ((ret = GetIfEntry( &row ))) return ret; + memset( guid, 0, sizeof(*guid) ); guid->Data1 = luid->Info.NetLuidIndex; return NO_ERROR; }

1 0

Nikolay Sivov : dwrite: Initial support for number substitution.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 5f7848595f984089525ecc69c54479d756aca8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7848595f984089525ecc69c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 10 10:30:50 2017 +0300 dwrite: Initial support for number substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 119 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 104 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 8f32bec..5ae16a1 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -225,6 +225,8 @@ static inline struct dwrite_numbersubstitution *impl_from_IDWriteNumberSubstitut return CONTAINING_RECORD(iface, struct dwrite_numbersubstitution, IDWriteNumberSubstitution_iface); } +static struct dwrite_numbersubstitution *unsafe_impl_from_IDWriteNumberSubstitution(IDWriteNumberSubstitution *iface); + static inline struct dwrite_fontfallback *impl_from_IDWriteFontFallback(IDWriteFontFallback *iface) { return CONTAINING_RECORD(iface, struct dwrite_fontfallback, IDWriteFontFallback_iface); @@ -1022,6 +1024,75 @@ static UINT32 get_opentype_language(const WCHAR *locale) return language; } +static DWRITE_NUMBER_SUBSTITUTION_METHOD get_number_substitutes(IDWriteNumberSubstitution *substitution, WCHAR *digits) +{ + struct dwrite_numbersubstitution *numbersubst = unsafe_impl_from_IDWriteNumberSubstitution(substitution); + DWRITE_NUMBER_SUBSTITUTION_METHOD method; + WCHAR isolang[9]; + DWORD lctype; + + if (!numbersubst) + return DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE; + + lctype = numbersubst->ignore_user_override ? LOCALE_NOUSEROVERRIDE : 0; + + if (numbersubst->method == DWRITE_NUMBER_SUBSTITUTION_METHOD_FROM_CULTURE) { + DWORD value; + + method = DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE; + if (GetLocaleInfoEx(numbersubst->locale, lctype | LOCALE_IDIGITSUBSTITUTION | LOCALE_RETURN_NUMBER, (WCHAR *)&value, 2)) { + switch (value) + { + case 0: + method = DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL; + break; + case 2: + method = DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL; + break; + case 1: + default: + if (value != 1) + WARN("Unknown IDIGITSUBSTITUTION value %u, locale %s.\n", value, debugstr_w(numbersubst->locale)); + } + } + else + WARN("Failed to get IDIGITSUBSTITUTION for locale %s\n", debugstr_w(numbersubst->locale)); + } + else + method = numbersubst->method; + + digits[0] = 0; + switch (method) + { + case DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL: + GetLocaleInfoEx(numbersubst->locale, lctype | LOCALE_SNATIVEDIGITS, digits, sizeof(digits)/sizeof(digits[0])); + break; + case DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL: + case DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL: + if (GetLocaleInfoEx(numbersubst->locale, LOCALE_SISO639LANGNAME, isolang, sizeof(isolang)/sizeof(isolang[0]))) { + static const WCHAR arW[] = {'a','r',0}; + static const WCHAR arabicW[] = {0x640,0x641,0x642,0x643,0x644,0x645,0x646,0x647,0x648,0x649,0}; + + /* For some Arabic locales Latin digits are returned for SNATIVEDIGITS */ + if (!strcmpW(arW, isolang)) { + strcpyW(digits, arabicW); + break; + } + } + GetLocaleInfoEx(numbersubst->locale, lctype | LOCALE_SNATIVEDIGITS, digits, sizeof(digits)/sizeof(digits[0])); + break; + default: + ; + } + + if (method != DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE && !*digits) { + WARN("Failed to get number substitutes for locale %s, method %d\n", debugstr_w(numbersubst->locale), method); + method = DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE; + } + + return method; +} + static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, WCHAR const* text, UINT32 length, IDWriteFontFace* fontface, BOOL is_sideways, BOOL is_rtl, DWRITE_SCRIPT_ANALYSIS const* analysis, WCHAR const* locale, @@ -1031,10 +1102,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, DWRITE_SHAPING_GLYPH_PROPERTIES* glyph_props, UINT32* actual_glyph_count) { const struct dwritescript_properties *scriptprops; + DWRITE_NUMBER_SUBSTITUTION_METHOD method; struct scriptshaping_context context; struct scriptshaping_cache *cache = NULL; BOOL update_cluster, need_vertical; IDWriteFontFace1 *fontface1; + WCHAR digits[11]; WCHAR *string; UINT32 i, g; HRESULT hr = S_OK; @@ -1050,8 +1123,11 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, if (max_glyph_count < length) return E_NOT_SUFFICIENT_BUFFER; - if (substitution) - FIXME("number substitution is not supported.\n"); + string = heap_alloc(sizeof(WCHAR)*length); + if (!string) + return E_OUTOFMEMORY; + + method = get_number_substitutes(substitution, digits); for (i = 0; i < length; i++) { /* FIXME: set to better values */ @@ -1066,6 +1142,21 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, text_props[i].reserved = 0; clustermap[i] = i; + + string[i] = text[i]; + switch (method) + { + case DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL: + if (!is_rtl) + break; + /* fallthrough */ + default: + if (string[i] >= '0' && string[i] <= '9') + string[i] = digits[string[i] - '0']; + break; + case DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE: + ; + } } for (; i < max_glyph_count; i++) { @@ -1076,10 +1167,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, glyph_props[i].reserved = 0; } - string = heap_alloc(sizeof(WCHAR)*length); - if (!string) - return E_OUTOFMEMORY; - hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); if (FAILED(hr)) WARN("failed to get IDWriteFontFace1\n"); @@ -1090,16 +1177,11 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, UINT32 codepoint; if (!update_cluster) { - codepoint = decode_surrogate_pair(text, i, length); - if (!codepoint) { - codepoint = is_rtl ? bidi_get_mirrored_char(text[i]) : text[i]; - string[i] = codepoint; - } - else { - string[i] = text[i]; - string[i+1] = text[i+1]; + codepoint = decode_surrogate_pair(string, i, length); + if (!codepoint) + codepoint = is_rtl ? bidi_get_mirrored_char(string[i]) : string[i]; + else update_cluster = TRUE; - } hr = IDWriteFontFace_GetGlyphIndices(fontface, &codepoint, 1, &glyph_indices[g]); if (FAILED(hr)) @@ -1778,6 +1860,13 @@ static const struct IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = { dwritenumbersubstitution_Release }; +struct dwrite_numbersubstitution *unsafe_impl_from_IDWriteNumberSubstitution(IDWriteNumberSubstitution *iface) +{ + if (!iface || iface->lpVtbl != &numbersubstitutionvtbl) + return NULL; + return CONTAINING_RECORD(iface, struct dwrite_numbersubstitution, IDWriteNumberSubstitution_iface); +} + HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD method, const WCHAR *locale, BOOL ignore_user_override, IDWriteNumberSubstitution **ret) {

1 0

Hans Leidekker : netprofm: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 25d3bc3064da2006210236feb49a388a48a12034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d3bc3064da2006210236feb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 10 14:28:12 2017 +0200 netprofm: Fix compilation on systems that don't support nameless unions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 8847758..d82ae36 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -18,6 +18,8 @@ */ #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "config.h" #include <stdarg.h> @@ -1693,7 +1695,7 @@ static void init_networks( struct list_manager *mgr ) struct network *network; struct connection *connection; - id.Data1 = aa->IfIndex; + id.Data1 = aa->u.s.IfIndex; /* assume a one-to-one mapping between networks and connections */ if (!(network = create_network( &id ))) goto done;

1 0

Rosanne DiMesio : screenshots.php: add warning about file size limit
by Jeremy Newman 10 May '17

10 May '17

Module: appdb Branch: master Commit: 603aaf97a0d6f80e14dc57b1d532a879abfcc07b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=603aaf97a0d6f80e14dc57b1… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue May 9 16:25:06 2017 -0500 screenshots.php: add warning about file size limit Tells users about the file size limit before they try to upload. Fixes bugs 41917 and 42936. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- screenshots.php | 1 + 1 file changed, 1 insertion(+) diff --git a/screenshots.php b/screenshots.php index f5e304e..2c2e783 100644 --- a/screenshots.php +++ b/screenshots.php @@ -145,6 +145,7 @@ if($aClean['iVersionId'] && $_SESSION['current']->isLoggedIn()) echo "<tr><td><ul>"; echo "<li>Do not upload screenshots of error messages, installers, game menus etc.</li>"; echo "<li>Crop the image so that only the application is shown and not your desktop.</li>"; + echo "<li>Files must be smaller than 600KB.</li>"; echo "</ul></td></tr></table></p>"; echo '<form enctype="multipart/form-data" action="screenshots.php" name="sImageForm" method="post">',"\n";

1 0

Jacek Caban : mshtml: Added separated IE5 and quicks mode compatibility mode.
by Alexandre Julliard 09 May '17

09 May '17

Module: wine Branch: master Commit: ce80f1e49d18132755e0f9d69facf337c7d42178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce80f1e49d18132755e0f9d69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 9 17:32:45 2017 +0200 mshtml: Added separated IE5 and quicks mode compatibility mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 3 ++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index cb04f19..cb1fe55 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2997,7 +2997,7 @@ static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR * TRACE("(%p)->(%p)\n", This, p); - *p = SysAllocString(This->doc_node->document_mode == COMPAT_MODE_QUIRKS ? BackCompatW : CSS1CompatW); + *p = SysAllocString(This->doc_node->document_mode <= COMPAT_MODE_IE5 ? BackCompatW : CSS1CompatW); return *p ? S_OK : E_OUTOFMEMORY; } @@ -3098,6 +3098,7 @@ static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, VARI static const int docmode_values[] = { 5, /* DOCMODE_QUIRKS */ + 5, /* DOCMODE_IE5 */ 7, /* DOCMODE_IE7 */ 8, /* DOCMODE_IE8 */ 9, /* DOCMODE_IE8 */ diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d68816d..876827b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -233,6 +233,7 @@ TID_LIST typedef enum { COMPAT_MODE_QUIRKS, + COMPAT_MODE_IE5, COMPAT_MODE_IE7, COMPAT_MODE_IE8, COMPAT_MODE_IE9, diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 84a290e..ef4c58c 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -388,6 +388,10 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) return FALSE; switch(v){ + case 5: + case 6: + *r = COMPAT_MODE_IE5; + break; case 7: *r = COMPAT_MODE_IE7; break; @@ -401,7 +405,7 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) *r = COMPAT_MODE_IE10; break; default: - *r = v < 7 ? COMPAT_MODE_QUIRKS : COMPAT_MODE_IE11; + *r = v < 5 ? COMPAT_MODE_QUIRKS : COMPAT_MODE_IE11; } return TRUE;

1 0

Jacek Caban : mshtml: Use IE version dependent on compatibility mode for conditional comments.
by Alexandre Julliard 09 May '17

09 May '17

Module: wine Branch: master Commit: d3d8d4f37a93ba70e7aac9aa6e425dedcd897a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d8d4f37a93ba70e7aac9aa6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 9 17:32:58 2017 +0200 mshtml: Use IE version dependent on compatibility mode for conditional comments. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 14 +---------- dlls/mshtml/mshtml_private.h | 7 ++++++ dlls/mshtml/mutation.c | 41 +++++++++++++++++++------------ dlls/mshtml/tests/documentmode.js | 51 ++++++++++++++++++++++++++++++++++----- dlls/mshtml/tests/script.c | 2 +- 5 files changed, 79 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index cb1fe55..c216448 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3096,16 +3096,6 @@ static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, VARI { HTMLDocument *This = impl_from_IHTMLDocument6(iface); - static const int docmode_values[] = { - 5, /* DOCMODE_QUIRKS */ - 5, /* DOCMODE_IE5 */ - 7, /* DOCMODE_IE7 */ - 8, /* DOCMODE_IE8 */ - 9, /* DOCMODE_IE8 */ - 10, /* DOCMODE_IE10 */ - 11 /* DOCMODE_IE11 */ - }; - TRACE("(%p)->(%p)\n", This, p); if(!This->doc_node) { @@ -3113,10 +3103,8 @@ static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, VARI return E_UNEXPECTED; } - assert(This->doc_node->document_mode < sizeof(docmode_values)/sizeof(*docmode_values)); - V_VT(p) = VT_I4; - V_I4(p) = docmode_values[This->doc_node->document_mode]; + V_I4(p) = compat_mode_info[This->doc_node->document_mode].document_mode; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 876827b..eceadca 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -244,6 +244,13 @@ typedef enum { #define COMPAT_MODE_CNT (COMPAT_MODE_IE11+1) #define COMPAT_MODE_NONE COMPAT_MODE_QUIRKS +typedef struct { + unsigned document_mode; + unsigned ie_version; +} compat_mode_info_t; + +extern const compat_mode_info_t compat_mode_info[COMPAT_MODE_CNT] DECLSPEC_HIDDEN; + typedef struct dispex_data_t dispex_data_t; typedef struct dispex_dynamic_data_t dispex_dynamic_data_t; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index ef4c58c..50e162e 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -39,8 +39,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -#define IE_MAJOR_VERSION 7 -#define IE_MINOR_VERSION 0 +const compat_mode_info_t compat_mode_info[] = { + { 5, 7 }, /* DOCMODE_QUIRKS */ + { 5, 5 }, /* DOCMODE_IE5 */ + { 7, 7 }, /* DOCMODE_IE7 */ + { 8, 8 }, /* DOCMODE_IE8 */ + { 9, 9 }, /* DOCMODE_IE8 */ + { 10, 10 }, /* DOCMODE_IE10 */ + { 11, 11 } /* DOCMODE_IE11 */ +}; static const IID NS_ICONTENTUTILS_CID = {0x762C4AE7,0xB923,0x422F,{0xB9,0x7E,0xB9,0xBF,0xC1,0xEF,0x7B,0xF0}}; @@ -49,7 +56,7 @@ static nsIContentUtils *content_utils; static PRUnichar *handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *comment) { - int majorv = 0, minorv = 0; + unsigned majorv = 0, minorv = 0, compat_version; const PRUnichar *ptr, *end; PRUnichar *buf; DWORD len; @@ -130,33 +137,35 @@ static PRUnichar *handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar * if(memcmp(end, endifW, sizeof(endifW))) return NULL; + compat_version = compat_mode_info[doc->document_mode].ie_version; + if(compat_version > 8) { + /* + * Ideally we should handle higher versions, but right now it would cause more problems than it's worth. + * We should revisit that once more IE9 features are implemented, most notably new events APIs. + */ + WARN("Using compat version 8\n"); + compat_version = 8; + } + switch(cmpt) { case CMP_EQ: - if(majorv == IE_MAJOR_VERSION && minorv == IE_MINOR_VERSION) + if(compat_version == majorv && !minorv) break; return NULL; case CMP_LT: - if(majorv > IE_MAJOR_VERSION) - break; - if(majorv == IE_MAJOR_VERSION && minorv > IE_MINOR_VERSION) + if(compat_version < majorv || (compat_version == majorv && minorv)) break; return NULL; case CMP_LTE: - if(majorv > IE_MAJOR_VERSION) - break; - if(majorv == IE_MAJOR_VERSION && minorv >= IE_MINOR_VERSION) + if(compat_version <= majorv) break; return NULL; case CMP_GT: - if(majorv < IE_MAJOR_VERSION) - break; - if(majorv == IE_MAJOR_VERSION && minorv < IE_MINOR_VERSION) + if(compat_version > majorv) break; return NULL; case CMP_GTE: - if(majorv < IE_MAJOR_VERSION) - break; - if(majorv == IE_MAJOR_VERSION && minorv <= IE_MINOR_VERSION) + if(compat_version >= majorv || (compat_version == majorv && !minorv)) break; return NULL; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 292955a..a7340e2 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +var compat_version; + function test_elem_props() { var elem = document.documentElement; @@ -35,17 +37,17 @@ function test_elem_props() { } function test_doc_mode() { - var opt = parseInt(document.location.search.substring(1)); + compat_version = parseInt(document.location.search.substring(1)); - trace("Testing document mode " + opt); + trace("Testing compatibility mode " + compat_version); - if(opt > document.documentMode) { - win_skip("Document mode not supported (expected " + opt + " got " + document.documentMode + ")"); + if(compat_version > 6 && compat_version > document.documentMode) { + win_skip("Document mode not supported (expected " + compat_version + " got " + document.documentMode + ")"); reportSuccess(); return; } - ok(opt === document.documentMode, "documentMode = " + document.documentMode); + ok(Math.max(compat_version, 5) === document.documentMode, "documentMode = " + document.documentMode); if(document.documentMode > 5) ok(document.compatMode === "CSS1Compat", "document.compatMode = " + document.compatMode); @@ -55,7 +57,44 @@ function test_doc_mode() { next_test(); } +function test_conditional_comments() { + var div = document.createElement("div"); + document.body.appendChild(div); + + function test_version(v) { + var version = compat_version ? compat_version : 7; + + /* Uncomment and fix tests below once we support that. */ + if(version >= 9) + return; + + div.innerHTML = ""; + ok(div.innerText === (version <= v ? "true" : ""), + "div.innerText = " + div.innerText + " for version (<=) " + v); + + div.innerHTML = ""; + ok(div.innerText === (version < v ? "true" : ""), + "div.innerText = " + div.innerText + " for version (<) " + v); + + div.innerHTML = ""; + ok(div.innerText === (version >= v ? "true" : ""), + "div.innerText = " + div.innerText + " for version (>=) " + v); + + div.innerHTML = ""; + ok(div.innerText === (version > v ? "true" : ""), + "div.innerText = " + div.innerText + " for version (>) " + v); + } + + test_version(5); + test_version(6); + test_version(7); + test_version(8); + + next_test(); +} + var tests = [ test_doc_mode, - test_elem_props + test_elem_props, + test_conditional_comments ]; diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 322314b..2753d7d 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3462,7 +3462,7 @@ static void run_js_tests(void) run_script_as_http_with_mode("navigation.js", NULL, NULL); run_script_as_http_with_mode("navigation.js", NULL, "11"); - run_script_as_http_with_mode("documentmode.js", "?5", NULL); + run_script_as_http_with_mode("documentmode.js", "?0", NULL); run_script_as_http_with_mode("documentmode.js", "?5", "5"); run_script_as_http_with_mode("documentmode.js", "?5", "6"); run_script_as_http_with_mode("documentmode.js", "?7", "7");

1 0

Nikolay Sivov : comctl32/listview: Convert item text once when looking for insertion point.
by Alexandre Julliard 09 May '17

09 May '17

Module: wine Branch: master Commit: 8ef79b023a06f00ca6ab37afb8089d358b277d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef79b023a06f00ca6ab37afb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 9 22:11:56 2017 +0300 comctl32/listview: Convert item text once when looking for insertion point. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index acafbd3..70a6e6d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7824,18 +7824,24 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, HDPA hItem; ITEM_INFO *item_s; INT i = 0, cmpv; + WCHAR *textW; + + textW = textdupTtoW(lpLVItem->pszText, isW); while (i < infoPtr->nItemCount) { hItem = DPA_GetPtr( infoPtr->hdpaItems, i); item_s = DPA_GetPtr(hItem, 0); - cmpv = textcmpWT(item_s->hdr.pszText, lpLVItem->pszText, isW); + cmpv = textcmpWT(item_s->hdr.pszText, textW, TRUE); if (infoPtr->dwStyle & LVS_SORTDESCENDING) cmpv *= -1; if (cmpv >= 0) break; i++; } + + textfreeT(textW, isW); + nItem = i; } else

1 0