March 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Use wcsupr() instead of toupperW().
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: f599b2cf255353a7a406df8137b392117e0f6fe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f599b2cf255353a7a406df81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 13:43:20 2020 +0100 ntdll: Use wcsupr() instead of toupperW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 13 ++++++------- dlls/ntdll/ntdll_misc.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 53da0b0fc8..b8a23c4d4d 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1296,9 +1296,8 @@ BOOL DIR_is_hidden_file( const UNICODE_STRING *name ) /*********************************************************************** * hash_short_file_name * - * Transform a Unix file name into a hashed DOS name. If the name is a valid - * DOS name, it is converted to upper-case; otherwise it is replaced by a - * hashed version that fits in 8.3 format. + * Transform a Unix file name into a hashed DOS name. If the name is not a valid + * DOS name, it is replaced by a hashed version that fits in 8.3 format. * 'buffer' must be at least 12 characters long. * Returns length of short name in bytes; short name is NOT null-terminated. */ @@ -1334,7 +1333,7 @@ static ULONG hash_short_file_name( const UNICODE_STRING *name, LPWSTR buffer ) for (i = 4, p = name->Buffer, dst = buffer; i > 0; i--, p++) { if (p == end || p == ext) break; - *dst++ = is_invalid_dos_char(*p) ? '_' : toupperW(*p); + *dst++ = is_invalid_dos_char(*p) ? '_' : *p; } /* Pad to 5 chars with '~' */ while (i-- >= 0) *dst++ = '~'; @@ -1349,7 +1348,7 @@ static ULONG hash_short_file_name( const UNICODE_STRING *name, LPWSTR buffer ) { *dst++ = '.'; for (i = 3, ext++; (i > 0) && ext < end; i--, ext++) - *dst++ = is_invalid_dos_char(*ext) ? '_' : toupperW(*ext); + *dst++ = is_invalid_dos_char(*ext) ? '_' : *ext; } return dst - buffer; } @@ -1446,7 +1445,7 @@ static BOOLEAN match_filename( const UNICODE_STRING *name_str, const UNICODE_STR static BOOL append_entry( struct dir_data *data, const char *long_name, const char *short_name, const UNICODE_STRING *mask ) { - int i, long_len, short_len; + int long_len, short_len; WCHAR long_nameW[MAX_DIR_ENTRY_LEN + 1]; WCHAR short_nameW[13]; UNICODE_STRING str; @@ -1463,7 +1462,6 @@ static BOOL append_entry( struct dir_data *data, const char *long_name, { short_len = ntdll_umbstowcs( short_name, strlen(short_name), short_nameW, ARRAY_SIZE( short_nameW ) - 1 ); - for (i = 0; i < short_len; i++) short_nameW[i] = toupperW( short_nameW[i] ); } else /* generate a short name if necessary */ { @@ -1474,6 +1472,7 @@ static BOOL append_entry( struct dir_data *data, const char *long_name, short_len = hash_short_file_name( &str, short_nameW ); } short_nameW[short_len] = 0; + wcsupr( short_nameW ); TRACE( "long %s short %s mask %s\n", debugstr_w( long_nameW ), debugstr_w( short_nameW ), debugstr_us( mask )); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 953b29dfe5..84493bc493 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -298,6 +298,7 @@ ULONG __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base ); #define wcsicmp(s1,s2) NTDLL__wcsicmp(s1,s2) #define wcsnicmp(s1,s2,n) NTDLL__wcsnicmp(s1,s2,n) +#define wcsupr(s) NTDLL__wcsupr(s) /* convert from straight ASCII to Unicode without depending on the current codepage */ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len )

1 0

Alexandre Julliard : ntdll: Use wcslwr() instead of tolowerW().
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 59d0ad23c7cf7fcb5696e3893cbf7ab1746b0320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59d0ad23c7cf7fcb5696e389… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 13:44:03 2020 +0100 ntdll: Use wcslwr() instead of tolowerW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 10 ++++++---- dlls/ntdll/ntdll_misc.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b8a23c4d4d..993a661015 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2344,7 +2344,7 @@ static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, ANSI_STRING *u strcat( unix_name, "/dosdevices/" ); dev = unix_name + strlen(unix_name); - for (i = 0; i < name_len; i++) dev[i] = (char)tolowerW(name[i]); + for (i = 0; i < name_len; i++) dev[i] = (name[i] >= 'A' && name[i] <= 'Z' ? name[i] + 32 : name[i]); dev[i] = 0; /* special case for drive devices */ @@ -2755,7 +2755,7 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI struct stat st; char *unix_name; int pos, ret, name_len, unix_len, prefix_len; - WCHAR prefix[MAX_DIR_ENTRY_LEN]; + WCHAR prefix[MAX_DIR_ENTRY_LEN + 1]; BOOLEAN is_unix = FALSE; name = nameW->Buffer; @@ -2784,8 +2784,10 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI if (pos == name_len) /* no subdir, plain DOS device */ return get_dos_device( name, name_len, unix_name_ret ); - for (prefix_len = 0; prefix_len < pos; prefix_len++) - prefix[prefix_len] = tolowerW(name[prefix_len]); + prefix_len = pos; + memcpy( prefix, name, prefix_len * sizeof(WCHAR) ); + prefix[prefix_len] = 0; + wcslwr( prefix ); name += prefix_len; name_len -= prefix_len; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 84493bc493..20feabf56b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -298,6 +298,7 @@ ULONG __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base ); #define wcsicmp(s1,s2) NTDLL__wcsicmp(s1,s2) #define wcsnicmp(s1,s2,n) NTDLL__wcsnicmp(s1,s2,n) +#define wcslwr(s) NTDLL__wcslwr(s) #define wcsupr(s) NTDLL__wcsupr(s) /* convert from straight ASCII to Unicode without depending on the current codepage */

1 0

Nikolay Sivov : mfplat: Add remaining media type attributes guids.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 5ef6ecb3aae43a1df793dde974f1d236a59855ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ef6ecb3aae43a1df793dde9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 27 17:16:14 2020 +0300 mfplat: Add remaining media type attributes guids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 36 +++++++++++++++++++++++++++++++++++- include/mfapi.h | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ef6ecb3aae43a1df793…

1 0

Nikolay Sivov : mf: Fix returned session rates when pipeline objects don't support rate control.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 3e12d29c87ec8411bd8865d8843d96237c006db0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e12d29c87ec8411bd8865d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 27 17:17:33 2020 +0300 mf: Fix returned session rates when pipeline objects don't support rate control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 58 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 2147f70cc8..debb58de4d 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2805,28 +2805,41 @@ static ULONG WINAPI session_rate_support_Release(IMFRateSupport *iface) return IMFMediaSession_Release(&session->IMFMediaSession_iface); } -static void session_presentation_object_get_rate(IUnknown *object, MFRATE_DIRECTION direction, +static HRESULT session_presentation_object_get_rate(IUnknown *object, MFRATE_DIRECTION direction, BOOL thin, BOOL fastest, float *result) { IMFRateSupport *rate_support; float rate; + HRESULT hr; - if (SUCCEEDED(MFGetService(object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) + /* For objects that don't support rate control, it's assumed that only forward direction is allowed, at 1.0f. */ + + if (FAILED(hr = MFGetService(object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) { - rate = 0.0f; - if (fastest) + if (direction == MFRATE_FORWARD) { - if (SUCCEEDED(IMFRateSupport_GetFastestRate(rate_support, direction, thin, &rate))) - *result = min(fabsf(rate), *result); + *result = 1.0f; + return S_OK; } else - { - if (SUCCEEDED(IMFRateSupport_GetSlowestRate(rate_support, direction, thin, &rate))) - *result = max(fabsf(rate), *result); - } + return MF_E_REVERSE_UNSUPPORTED; + } - IMFRateSupport_Release(rate_support); + rate = 0.0f; + if (fastest) + { + if (SUCCEEDED(hr = IMFRateSupport_GetFastestRate(rate_support, direction, thin, &rate))) + *result = min(fabsf(rate), *result); + } + else + { + if (SUCCEEDED(hr = IMFRateSupport_GetSlowestRate(rate_support, direction, thin, &rate))) + *result = max(fabsf(rate), *result); } + + IMFRateSupport_Release(rate_support); + + return hr; } static HRESULT session_get_presentation_rate(struct media_session *session, MFRATE_DIRECTION direction, @@ -2834,24 +2847,33 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA { struct media_source *source; struct media_sink *sink; + HRESULT hr = E_POINTER; *result = 0.0f; EnterCriticalSection(&session->cs); - LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) { - session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, result); - } + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, result))) + break; + } - LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) - { - session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, result); + if (SUCCEEDED(hr)) + { + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) + { + if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, result))) + break; + } + } } LeaveCriticalSection(&session->cs); - return S_OK; + return hr; } static HRESULT WINAPI session_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction,

1 0

Hans Leidekker : webservices: Read past XML declaration and opening bracket in WsReadStartElement.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 9d530346cc47b9d0600d26ff2fcfb2a97edcd84b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d530346cc47b9d0600d26ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 15:47:38 2020 +0100 webservices: Read past XML declaration and opening bracket in WsReadStartElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 13 +++++++++-- dlls/webservices/tests/reader.c | 48 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index f1ce93b7d7..119043f705 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2654,7 +2654,17 @@ static HRESULT read_node_text( struct reader * ); static HRESULT read_startelement_text( struct reader *reader ) { + HRESULT hr; + + if (read_cmp( reader, "<?", 2 ) == S_OK) + { + if ((hr = read_xmldecl( reader )) != S_OK) return hr; + } read_skip_whitespace( reader ); + if (read_cmp( reader, "<", 1 ) == S_OK) + { + if ((hr = read_element_text( reader )) != S_OK) return hr; + } if (read_cmp( reader, "/>", 2 ) == S_OK) { read_skip( reader, 2 ); @@ -3021,8 +3031,7 @@ static HRESULT read_node_text( struct reader *reader ) else if (reader->state == READER_STATE_CDATA) return read_endcdata( reader ); else if (read_cmp( reader, "<?", 2 ) == S_OK) { - hr = read_xmldecl( reader ); - if (FAILED( hr )) return hr; + if ((hr = read_xmldecl( reader )) != S_OK) return hr; } else if (read_cmp( reader, "</", 2 ) == S_OK) return read_endelement_text( reader ); else if (read_cmp( reader, "<![CDATA[", 9 ) == S_OK) return read_startcdata( reader ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 5fb81b5dc8..ef6fd8808e 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -31,7 +31,7 @@ static const char data2[] = {0xef,0xbb,0xbf,'<','t','e','x','t','>','t','e','s','t','<','/','t','e','x','t','>',0}; static const char data3[] = - "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + "<?xml version=\"1.0\" encoding=\"utf-8\"?> " "<text>test</TEXT>"; static const char data4[] = @@ -928,6 +928,52 @@ static void test_WsReadStartElement(void) hr = WsReadEndElement( reader, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + hr = set_input( reader, data3, sizeof(data3) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + node = NULL; + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) + { + WS_XML_TEXT_NODE *text = (WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); + ok( text->text != NULL, "text not set\n" ); + if (text->text) + { + WS_XML_UTF8_TEXT *utf8 = (WS_XML_UTF8_TEXT *)text->text; + ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); + ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( !memcmp( utf8->value.bytes, "test", 4 ), "wrong data\n" ); + } + } + + hr = set_input( reader, " <text>test</text>", sizeof(" <text>test</text>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + node = NULL; + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) + { + WS_XML_TEXT_NODE *text = (WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); + ok( text->text != NULL, "text not set\n" ); + if (text->text) + { + WS_XML_UTF8_TEXT *utf8 = (WS_XML_UTF8_TEXT *)text->text; + ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); + ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( !memcmp( utf8->value.bytes, "test", 4 ), "wrong data\n" ); + } + } + WsFreeReader( reader ); }

1 0

Hans Leidekker : webservices: Accept empty namespace in attribute type mapping.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 6d5eef9c94b36f5bdfcbdef4c3fb705f9ebb780e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d5eef9c94b36f5bdfcbdef4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 15:47:39 2020 +0100 webservices: Accept empty namespace in attribute type mapping. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 21 ++++++++++++++++++--- dlls/webservices/tests/reader.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 119043f705..4d37a38a8a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4343,9 +4343,24 @@ static HRESULT get_text( struct reader *reader, WS_TYPE_MAPPING mapping, const W { case WS_ATTRIBUTE_TYPE_MAPPING: { - ULONG index; - if (!(*found = find_attribute( reader, localname, ns, &index ))) return S_OK; - return get_attribute_text( reader, index, ret ); + ULONG i; + WS_XML_ELEMENT_NODE *elem = &reader->current->hdr; + + *found = FALSE; + for (i = 0; i < elem->attributeCount; i++) + { + const WS_XML_STRING *localname2 = elem->attributes[i]->localName; + const WS_XML_STRING *ns2 = elem->attributes[i]->ns; + + if (cmp_name( localname->bytes, localname->length, localname2->bytes, localname2->length )) continue; + if (!ns->length || !cmp_name( ns->bytes, ns->length, ns2->bytes, ns2->length )) + { + *found = TRUE; + break; + } + } + if (!*found) return S_OK; + return get_attribute_text( reader, i, ret ); } case WS_ELEMENT_TYPE_MAPPING: case WS_ELEMENT_CONTENT_TYPE_MAPPING: diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index ef6fd8808e..733ebe3eb1 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -2556,7 +2556,8 @@ static void test_cdata(void) static void test_WsFindAttribute(void) { static const char test[] = "<t attr='value' attr2='value2'></t>"; - WS_XML_STRING ns = {0, NULL}, localname = {4, (BYTE *)"attr"}; + static const char test2[] = "<p:t attr='value' p:attr2='value2' xmlns:p=\"ns\"></t>"; + WS_XML_STRING ns = {0, NULL}, ns2 = {2, (BYTE *)"ns"}, localname = {4, (BYTE *)"attr"}; WS_XML_STRING localname2 = {5, (BYTE *)"attr2"}, localname3 = {5, (BYTE *)"attr3"}; WS_XML_READER *reader; ULONG index; @@ -2638,6 +2639,32 @@ static void test_WsFindAttribute(void) ok( hr == S_FALSE, "got %08x\n", hr ); ok( index == ~0u, "got %u\n", index ); + hr = set_input( reader, test2, sizeof(test2) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + index = 0xdeadbeef; + hr = WsFindAttribute( reader, &localname, &ns, TRUE, &index, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !index, "got %u\n", index ); + + hr = WsFindAttribute( reader, &localname2, &ns2, TRUE, &index, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFindAttribute( reader, &localname2, &ns, TRUE, &index, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_input( reader, test2, sizeof(test2) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFindAttribute( reader, &localname, &ns2, TRUE, &index, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeReader( reader ); }

1 0

Hans Leidekker : webservices: Implement WS_TYPE_ATTRIBUTE_FIELD_MAPPING for the reader.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: df7e24ff136cfcbaf7999a6e93afe84f12d662ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=df7e24ff136cfcbaf7999a6e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 15:47:40 2020 +0100 webservices: Implement WS_TYPE_ATTRIBUTE_FIELD_MAPPING for the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 45 ++++++++++++++++++++++++------ dlls/webservices/tests/reader.c | 62 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4d37a38a8a..0d0e7d09f0 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5968,6 +5968,29 @@ static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static HRESULT read_type_description( struct reader *reader, WS_TYPE_MAPPING mapping, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + const WS_STRUCT_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) +{ + switch (option) + { + case WS_READ_REQUIRED_POINTER: + case WS_READ_OPTIONAL_POINTER: + { + if (size != sizeof(desc)) return E_INVALIDARG; + *(const WS_STRUCT_DESCRIPTION **)ret = desc; + *found = TRUE; + break; + } + default: + FIXME( "read option %u not supported\n", option ); + return E_NOTIMPL; + } + + return S_OK; +} + static BOOL is_empty_text_node( const struct node *node ) { const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)node; @@ -6165,7 +6188,8 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) } } -static HRESULT read_type_field( struct reader *, const WS_FIELD_DESCRIPTION *, WS_HEAP *, char *, ULONG ); +static HRESULT read_type_field( struct reader *, const WS_STRUCT_DESCRIPTION *, const WS_FIELD_DESCRIPTION *, + WS_HEAP *, char *, ULONG ); static HRESULT read_type_union( struct reader *reader, const WS_UNION_DESCRIPTION *desc, WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) @@ -6193,7 +6217,7 @@ static HRESULT read_type_union( struct reader *reader, const WS_UNION_DESCRIPTIO else { ULONG offset = desc->fields[i]->field.offset; - if ((hr = read_type_field( reader, &desc->fields[i]->field, heap, ret, offset )) != S_OK) return hr; + if ((hr = read_type_field( reader, NULL, &desc->fields[i]->field, heap, ret, offset )) != S_OK) return hr; *(int *)((char *)ret + desc->enumOffset) = desc->fields[i]->value; } @@ -6297,8 +6321,8 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION return hr; } -static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, char *buf, - ULONG offset ) +static HRESULT read_type_field( struct reader *reader, const WS_STRUCT_DESCRIPTION *desc_struct, + const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, char *buf, ULONG offset ) { char *ptr; WS_READ_OPTION option; @@ -6323,8 +6347,9 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO switch (desc->mapping) { case WS_TYPE_ATTRIBUTE_FIELD_MAPPING: - FIXME( "WS_TYPE_ATTRIBUTE_FIELD_MAPPING not supported\n" ); - return S_OK; + hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->localName, desc->ns, + desc_struct, option, heap, ptr, size, &found ); + break; case WS_ATTRIBUTE_FIELD_MAPPING: hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->localName, desc->ns, @@ -6424,7 +6449,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, for (i = 0; i < desc->fieldCount; i++) { offset = desc->fields[i]->offset; - if ((hr = read_type_field( reader, desc->fields[i], heap, buf, offset )) != S_OK) break; + if ((hr = read_type_field( reader, desc, desc->fields[i], heap, buf, offset )) != S_OK) break; } switch (option) @@ -6651,6 +6676,10 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP hr = read_type_qname( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; + case WS_DESCRIPTION_TYPE: + hr = read_type_description( reader, mapping, localname, ns, desc, option, heap, value, size, found ); + break; + case WS_STRUCT_TYPE: hr = read_type_struct( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; @@ -7419,7 +7448,7 @@ static ULONG get_field_size( const WS_FIELD_DESCRIPTION *desc ) static HRESULT read_param( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, void *ret ) { if (!ret && !(ret = ws_alloc_zero( heap, get_field_size(desc) ))) return WS_E_QUOTA_EXCEEDED; - return read_type_field( reader, desc, heap, ret, 0 ); + return read_type_field( reader, NULL, desc, heap, ret, 0 ); } static HRESULT read_param_array( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 733ebe3eb1..4b9b589d8d 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -6841,6 +6841,67 @@ static void test_stream_input(void) WsFreeReader( reader ); } +static void test_description_type(void) +{ + static WS_XML_STRING ns = {0, NULL}, ns2 = {2, (BYTE *)"ns"}, localname = {1, (BYTE *)"t"}; + static WS_XML_STRING val = {3, (BYTE *)"val"}; + HRESULT hr; + WS_XML_READER *reader; + WS_HEAP *heap; + WS_FIELD_DESCRIPTION f, f2, *fields[2]; + WS_STRUCT_DESCRIPTION s; + struct test + { + const WS_STRUCT_DESCRIPTION *desc; + INT32 val; + } *test; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TYPE_ATTRIBUTE_FIELD_MAPPING; + f.type = WS_DESCRIPTION_TYPE; + fields[0] = &f; + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ATTRIBUTE_FIELD_MAPPING; + f2.localName = &val; + f2.ns = &ns; + f2.offset = FIELD_OFFSET(struct test, val); + f2.type = WS_INT32_TYPE; + fields[1] = &f2; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 2; + s.typeLocalName = &localname; + s.typeNs = &ns; + + prepare_struct_type_test( reader, "<t val=\"-1\" xmlns=\"ns\"/>" ); + hr = WsReadToStartElement( reader, &localname, &ns2, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + test = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + if (test) + { + ok( test->val == -1, "got %d\n", test->val ); + ok( test->desc == &s, "got %p\n", test->desc ); + } + + WsFreeReader( reader ); + WsFreeHeap( heap ); +} + START_TEST(reader) { test_WsCreateError(); @@ -6891,4 +6952,5 @@ START_TEST(reader) test_repeating_element_choice(); test_empty_text_field(); test_stream_input(); + test_description_type(); }

1 0

Hans Leidekker : webservices: Support WS_CHARSET_UTF16LE for buffer input.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 18d32bfb55a85ddacb6ffe02f00969d451584fa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18d32bfb55a85ddacb6ffe02… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 15:47:41 2020 +0100 webservices: Support WS_CHARSET_UTF16LE for buffer input. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 85 +++++++++++++++++++++++++++++------------ dlls/webservices/tests/reader.c | 2 +- 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0d0e7d09f0..ffa789fb6e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -395,7 +395,7 @@ struct reader WS_READ_CALLBACK input_cb; void *input_cb_state; struct xmlbuf *input_buf; - const unsigned char *input_data; + unsigned char *input_conv; ULONG input_size; ULONG text_conv_offset; unsigned char *stream_buf; @@ -519,6 +519,7 @@ static void free_reader( struct reader *reader ) clear_prefixes( reader->prefixes, reader->nb_prefixes ); heap_free( reader->prefixes ); heap_free( reader->stream_buf ); + heap_free( reader->input_conv ); reader->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &reader->cs ); @@ -6893,18 +6894,40 @@ static WS_CHARSET detect_charset( const unsigned char *data, ULONG size, ULONG * return ret; } -static void set_input_buffer( struct reader *reader, const unsigned char *data, ULONG size ) +static HRESULT utf16le_to_utf8( const unsigned char *data, ULONG size, unsigned char **buf, ULONG *buflen ) +{ + if (size % sizeof(WCHAR)) return E_INVALIDARG; + *buflen = WideCharToMultiByte( CP_UTF8, 0, (const WCHAR *)data, size / sizeof(WCHAR), NULL, 0, NULL, NULL ); + if (!(*buf = heap_alloc( *buflen ))) return E_OUTOFMEMORY; + WideCharToMultiByte( CP_UTF8, 0, (const WCHAR *)data, size / sizeof(WCHAR), (char *)*buf, *buflen, NULL, NULL ); + return S_OK; +} + +static HRESULT set_input_buffer( struct reader *reader, const unsigned char *data, ULONG size ) { reader->input_type = WS_XML_READER_INPUT_TYPE_BUFFER; reader->input_buf = NULL; - reader->input_data = data; - reader->input_size = size; - reader->read_size = reader->input_size; - reader->read_pos = 0; - reader->read_bufptr = reader->input_data; + if (reader->input_enc == WS_XML_READER_ENCODING_TYPE_TEXT && reader->input_charset == WS_CHARSET_UTF16LE) + { + unsigned char *buf; + ULONG buflen; + HRESULT hr; + + if ((hr = utf16le_to_utf8( data, size, &buf, &buflen )) != S_OK) return hr; + heap_free( reader->input_conv ); + reader->read_bufptr = reader->input_conv = buf; + reader->read_size = reader->input_size = buflen; + } + else + { + reader->read_bufptr = data; + reader->read_size = reader->input_size = size; + } + reader->read_pos = 0; reader->text_conv_offset = 0; + return S_OK; } static void set_input_stream( struct reader *reader, WS_READ_CALLBACK callback, void *state ) @@ -6913,7 +6936,6 @@ static void set_input_stream( struct reader *reader, WS_READ_CALLBACK callback, reader->input_cb = callback; reader->input_cb_state = state; reader->input_buf = NULL; - reader->input_data = reader->stream_buf; reader->input_size = STREAM_BUFSIZE; if (reader->read_pos >= reader->read_size) reader->read_size = 0; @@ -6922,9 +6944,8 @@ static void set_input_stream( struct reader *reader, WS_READ_CALLBACK callback, memmove( reader->stream_buf, reader->stream_buf + reader->read_pos, reader->read_size - reader->read_pos ); reader->read_size -= reader->read_pos; } - reader->read_pos = 0; - reader->read_bufptr = reader->input_data; - + reader->read_pos = 0; + reader->read_bufptr = reader->stream_buf; reader->text_conv_offset = 0; } @@ -6997,7 +7018,8 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * case WS_XML_READER_INPUT_TYPE_BUFFER: { const WS_XML_READER_BUFFER_INPUT *buf = (const WS_XML_READER_BUFFER_INPUT *)input; - set_input_buffer( reader, (const unsigned char *)buf->encodedData + offset, buf->encodedDataSize - offset ); + hr = set_input_buffer( reader, (const unsigned char *)buf->encodedData + offset, buf->encodedDataSize - offset ); + if (hr != S_OK) goto done; break; } case WS_XML_READER_INPUT_TYPE_STREAM: @@ -7026,22 +7048,35 @@ done: return hr; } -static void set_input_xml_buffer( struct reader *reader, struct xmlbuf *buf ) +static HRESULT set_input_xml_buffer( struct reader *reader, struct xmlbuf *xmlbuf ) { reader->input_type = WS_XML_READER_INPUT_TYPE_BUFFER; - reader->input_buf = buf; - reader->input_enc = buf->encoding; - reader->input_charset = buf->charset; - reader->input_data = buf->bytes.bytes; - reader->input_size = buf->bytes.length; - reader->dict_static = buf->dict_static; - reader->dict = buf->dict; - - reader->read_size = reader->input_size; - reader->read_pos = 0; - reader->read_bufptr = reader->input_data; + reader->input_buf = xmlbuf; + reader->input_enc = xmlbuf->encoding; + reader->input_charset = xmlbuf->charset; + reader->dict_static = xmlbuf->dict_static; + reader->dict = xmlbuf->dict; + + if (reader->input_enc == WS_XML_READER_ENCODING_TYPE_TEXT && reader->input_charset == WS_CHARSET_UTF16LE) + { + unsigned char *buf; + ULONG buflen; + HRESULT hr; + if ((hr = utf16le_to_utf8( xmlbuf->bytes.bytes, xmlbuf->bytes.length, &buf, &buflen )) != S_OK) return hr; + heap_free( reader->input_conv ); + reader->read_bufptr = reader->input_conv = buf; + reader->read_size = reader->input_size = buflen; + } + else + { + reader->read_bufptr = xmlbuf->bytes.bytes; + reader->read_size = reader->input_size = xmlbuf->bytes.length; + } + + reader->read_pos = 0; reader->text_conv_offset = 0; + return S_OK; } /************************************************************************** @@ -7078,7 +7113,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, } if ((hr = init_reader( reader )) != S_OK) goto done; - set_input_xml_buffer( reader, xmlbuf ); + if ((hr = set_input_xml_buffer( reader, xmlbuf )) != S_OK) goto done; if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) hr = E_OUTOFMEMORY; else read_insert_bof( reader, node ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 4b9b589d8d..7d56ebccd5 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -524,7 +524,7 @@ static void test_WsSetInput(void) found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); if (hr == S_OK) { ok( found == TRUE, "got %d\n", found );

1 0

Piotr Caban : msvcp90: Add std:_XLgamma implementation.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 70c3e08d32407c0d8ee751b124c438fc5910fc8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c3e08d32407c0d8ee751b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 27 16:33:44 2020 +0100 msvcp90: Add std:_XLgamma implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48806 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 6 +++--- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp120_app/msvcp120_app.spec | 6 +++--- dlls/msvcp140/msvcp140.spec | 6 +++--- dlls/msvcp90/math.c | 33 +++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 6 +++--- 7 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 4ca8d5b277..897b46fe90 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1260,9 +1260,9 @@ @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@UEAAXXZ(ptr) basic_streambuf_wchar__Unlock @ thiscall -arch=win32 ?_Unlock(a)_Mutex@std@@QAEXXZ(ptr) mutex_unlock @ cdecl -arch=win64 ?_Unlock(a)_Mutex@std@@QEAAXXZ(ptr) mutex_unlock -@ stub ?_XLgamma(a)tr1@std@@YAMM(a)Z -@ stub ?_XLgamma(a)tr1@std@@YANN(a)Z -@ stub ?_XLgamma(a)tr1@std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)tr1@std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)tr1@std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)tr1@std@@YAOO(a)Z(double) std__XLgamma_double @ stub ?_Xbad(a)tr1@std@@YAXW4error_type(a)regex_constants@12@@Z @ stub ?_Xfunc(a)tr1@std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index eebc430b1e..8d79f8c9a8 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1829,9 +1829,9 @@ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ @ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e131d41ecc..6308c57b29 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1790,9 +1790,9 @@ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ @ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index a76149071c..a44c89fdc8 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1790,9 +1790,9 @@ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ @ stub -arch=win32 ?_Winerror_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Winerror_map(a)std@@YAPEBDH(a)Z -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) msvcp120.?_XLgamma(a)std@@YAMM(a)Z +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) msvcp120.?_XLgamma(a)std@@YANN(a)Z +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) msvcp120.?_XLgamma(a)std@@YAOO(a)Z @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() msvcp120.?_Xbad_alloc(a)std@@YAXXZ @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) msvcp120.?_Xinvalid_argument(a)std@@YAXPBD(a)Z diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 70caad8dba..2563c7bfa7 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1673,9 +1673,9 @@ @ cdecl -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z(long ptr long) _Winerror_message @ cdecl -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z(long ptr long) _Winerror_message @ stub ?_XGetLastError(a)std@@YAXXZ -@ stub ?_XLgamma(a)std@@YAMM(a)Z -@ stub ?_XLgamma(a)std@@YANN(a)Z -@ stub ?_XLgamma(a)std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 9bc7c0867d..4ebf8baaee 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2362,3 +2362,36 @@ short __cdecl _FExp(float *x, float y, short scale) return dclass(*x); } + +/* ?_XLgamma(a)std@@YANN(a)Z */ +double __cdecl std__XLgamma_double(double z) +{ + /* Lanczos coefficients g=5, n=6 */ + static const double lc[] = { + 1.000000000190015, + 76.18009172947146, + -86.50532032941677, + 24.01409824083091, + -1.231739572450155, + 0.1208650973866179e-2, + -0.5395239384953e-5 + }; + static const double log_sqrt_2pi = 0.91893853320467274178; + + double base = z + 4.5, sum = 0; + int i; + + if (z < 0.5) return log(M_PI / sin(M_PI * z)) - std__XLgamma_double(1 - z); + + z--; + for(i = ARRAY_SIZE(lc) - 1; i >= 1; i--) + sum += lc[i] / (z + i); + sum += lc[0]; + return log_sqrt_2pi + log(sum) - base + log(base) * (z + 0.5); +} + +/* ?_XLgamma(a)tr1@std@@YAMM(a)Z */ +float __cdecl std__XLgamma_float(float z) +{ + return std__XLgamma_double(z); +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 6a5a9a20a4..c38dd041af 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3185,9 +3185,9 @@ @ cdecl -arch=win64 ?_Widen_s@?$ctype(a)G@std@@QEBAPEBDPEBD0PEAG_K(a)Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s @ thiscall -arch=win32 ?_Widen_s@?$ctype(a)_W@std@@QBEPBDPBD0PA_WI(a)Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s @ cdecl -arch=win64 ?_Widen_s@?$ctype(a)_W@std@@QEBAPEBDPEBD0PEA_W_K(a)Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s -@ stub ?_XLgamma(a)tr1@std@@YAMM(a)Z -@ stub ?_XLgamma(a)tr1@std@@YANN(a)Z -@ stub ?_XLgamma(a)tr1@std@@YAOO(a)Z +@ cdecl ?_XLgamma(a)tr1@std@@YAMM(a)Z(float) std__XLgamma_float +@ cdecl ?_XLgamma(a)tr1@std@@YANN(a)Z(double) std__XLgamma_double +@ cdecl ?_XLgamma(a)tr1@std@@YAOO(a)Z(double) std__XLgamma_double @ stub ?_Xbad(a)tr1@std@@YAXW4error_type(a)regex_constants@12@@Z @ stub -arch=win32 ?_Xfsopen(a)std@@YAPAU_iobuf@@PB_W0H(a)Z @ stub -arch=win64 ?_Xfsopen(a)std@@YAPEAU_iobuf@@PEB_W0H(a)Z

1 0

Dmitry Timoshkov : adsldp: Add more traces.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: dbe8d61c7055d0bc5713f90b0e9ce3f3389a8144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbe8d61c7055d0bc5713f90b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 27 17:06:16 2020 +0800 adsldp: Add more traces. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7385a40e25..b88867bec1 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -611,6 +611,7 @@ static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) for (idx = 0; idx < count; idx++) { + TRACE("=> %s\n", debugstr_w(ldap->attrs[i].values[idx])); V_VT(&item) = VT_BSTR; V_BSTR(&item) = SysAllocString(ldap->attrs[i].values[idx]); if (!V_BSTR(&item)) @@ -633,6 +634,7 @@ fail: } else { + TRACE("=> %s\n", debugstr_w(ldap->attrs[i].values[0])); V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]); if (!V_BSTR(prop)) return E_OUTOFMEMORY; V_VT(prop) = VT_BSTR; @@ -1178,7 +1180,10 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte } for (i = 0; i < count; i++) + { + TRACE("=> %s\n", debugstr_w(names[i])); props[i] = names[i]; + } props[count] = NULL; }

1 0