July 2017 - Wine-Commits - list.winehq.org

Hans Leidekker : webservices: Add support for GUID records in the writer.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: b85e6800d011a5a2203fea4dfd105ba6e0366555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85e6800d011a5a2203fea4df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:35 2017 +0200 webservices: Add support for GUID records in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 15 +++++++++------ dlls/webservices/webservices_private.h | 8 ++++---- dlls/webservices/writer.c | 33 ++++++++++++++++++++++++++------- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4aacaf7..63de1ad 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1541,7 +1541,7 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE if (!(text_utf8 = alloc_utf8_text( str->bytes, str->length ))) return E_OUTOFMEMORY; break; - case RECORD_UNIQUEID_TEXT: + case RECORD_UNIQUE_ID_TEXT: { WS_XML_UNIQUE_ID_TEXT *text_unique_id; if ((hr = read_bytes( reader, (unsigned char *)&guid, sizeof(guid) )) != S_OK) return hr; @@ -1549,7 +1549,7 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE attr->value = &text_unique_id->text; return S_OK; } - case RECORD_UUID_TEXT: + case RECORD_GUID_TEXT: { WS_XML_GUID_TEXT *guid_text; if ((hr = read_bytes( reader, (unsigned char *)&guid, sizeof(guid) )) != S_OK) return hr; @@ -2446,14 +2446,14 @@ static HRESULT read_text_bin( struct reader *reader ) if (!(node = alloc_utf8_text_node( str->bytes, str->length, NULL ))) return E_OUTOFMEMORY; break; } - case RECORD_UNIQUEID_TEXT: - case RECORD_UNIQUEID_TEXT_WITH_ENDELEMENT: + case RECORD_UNIQUE_ID_TEXT: + case RECORD_UNIQUE_ID_TEXT_WITH_ENDELEMENT: if ((hr = read_bytes( reader, (unsigned char *)&uuid, sizeof(uuid) )) != S_OK) return hr; if (!(node = alloc_unique_id_text_node( &uuid ))) return E_OUTOFMEMORY; break; - case RECORD_UUID_TEXT: - case RECORD_UUID_TEXT_WITH_ENDELEMENT: + case RECORD_GUID_TEXT: + case RECORD_GUID_TEXT_WITH_ENDELEMENT: if ((hr = read_bytes( reader, (unsigned char *)&uuid, sizeof(uuid) )) != S_OK) return hr; if (!(node = alloc_guid_text_node( &uuid ))) return E_OUTOFMEMORY; break; @@ -5857,6 +5857,9 @@ ULONG get_type_size( WS_TYPE type, const void *desc ) case WS_GUID_TYPE: return sizeof(GUID); + case WS_UNIQUE_ID_TYPE: + return sizeof(WS_UNIQUE_ID); + case WS_STRING_TYPE: return sizeof(WS_STRING); diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index ddaf59e..b88a50c 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -317,12 +317,12 @@ enum record_type RECORD_EMPTY_TEXT_WITH_ENDELEMENT = 0xa9, RECORD_DICTIONARY_TEXT = 0xaa, RECORD_DICTIONARY_TEXT_WITH_ENDELEMENT = 0xab, - RECORD_UNIQUEID_TEXT = 0xac, - RECORD_UNIQUEID_TEXT_WITH_ENDELEMENT = 0xad, + RECORD_UNIQUE_ID_TEXT = 0xac, + RECORD_UNIQUE_ID_TEXT_WITH_ENDELEMENT = 0xad, RECORD_TIMESPAN_TEXT = 0xae, RECORD_TIMESPAN_TEXT_WITH_ENDELEMENT = 0xaf, - RECORD_UUID_TEXT = 0xb0, - RECORD_UUID_TEXT_WITH_ENDELEMENT = 0xb1, + RECORD_GUID_TEXT = 0xb0, + RECORD_GUID_TEXT_WITH_ENDELEMENT = 0xb1, RECORD_UINT64_TEXT = 0xb2, RECORD_UINT64_TEXT_WITH_ENDELEMENT = 0xb3, RECORD_BOOL_TEXT = 0xb4, diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 78afa4a..e3b9214 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -716,6 +716,9 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) if (text_double->value <= MAX_INT32) return RECORD_INT32_TEXT; return RECORD_INT64_TEXT; } + case WS_XML_TEXT_TYPE_GUID: + return RECORD_GUID_TEXT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -851,8 +854,15 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, (const BYTE *)&text_double->value, sizeof(text_double->value) ); return S_OK; } + case RECORD_GUID_TEXT: + { + WS_XML_GUID_TEXT *text_guid = (WS_XML_GUID_TEXT *)text; + if ((hr = write_grow_buffer( writer, sizeof(text_guid->value) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&text_guid->value, sizeof(text_guid->value) ); + return S_OK; + } default: - ERR( "unhandled record type %02x\n", type ); + FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; } } @@ -2481,6 +2491,9 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) if (text_double->value <= MAX_INT32) return RECORD_INT32_TEXT_WITH_ENDELEMENT; return RECORD_INT64_TEXT_WITH_ENDELEMENT; } + case WS_XML_TEXT_TYPE_GUID: + return RECORD_GUID_TEXT_WITH_ENDELEMENT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2621,6 +2634,14 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U write_bytes( writer, (const BYTE *)&text_double->value, sizeof(text_double->value) ); return S_OK; } + case RECORD_GUID_TEXT_WITH_ENDELEMENT: + { + WS_XML_GUID_TEXT *text_guid = (WS_XML_GUID_TEXT *)text; + if ((hr = write_grow_buffer( writer, 1 + sizeof(text_guid->value) )) != S_OK) return hr; + write_char( writer, type ); + write_bytes( writer, (const BYTE *)&text_guid->value, sizeof(text_guid->value) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -3160,8 +3181,7 @@ static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_GUID_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { - WS_XML_UTF8_TEXT utf8; - unsigned char buf[37]; /* "00000000-0000-0000-0000-000000000000" */ + WS_XML_GUID_TEXT text_guid; const GUID *ptr; HRESULT hr; @@ -3175,10 +3195,9 @@ static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping, if ((hr = get_value_ptr( option, value, size, sizeof(GUID), (const void **)&ptr )) != S_OK) return hr; if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); - utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; - utf8.value.bytes = buf; - utf8.value.length = format_guid( ptr, buf ); - return write_type_text( writer, mapping, &utf8.text ); + text_guid.text.textType = WS_XML_TEXT_TYPE_GUID; + text_guid.value = *ptr; + return write_type_text( writer, mapping, &text_guid.text ); } static HRESULT write_type_unique_id( struct writer *writer, WS_TYPE_MAPPING mapping,

1 0

Hans Leidekker : webservices: Add support for double records in the writer.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 30abce8782598d26f21552eb2f8f78787abe54b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30abce8782598d26f21552eb2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:34 2017 +0200 webservices: Add support for double records in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index be8b200..78afa4a 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -704,6 +704,18 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) if (text_uint64->value <= MAX_INT64) return RECORD_INT64_TEXT; return RECORD_UINT64_TEXT; } + case WS_XML_TEXT_TYPE_DOUBLE: + { + const WS_XML_DOUBLE_TEXT *text_double = (const WS_XML_DOUBLE_TEXT *)text; + if (!text_double->value) return RECORD_ZERO_TEXT; + if (text_double->value == 1) return RECORD_ONE_TEXT; + if (isinf( text_double->value ) || (INT64)text_double->value != text_double->value) + return RECORD_DOUBLE_TEXT; + if (text_double->value <= MAX_INT8) return RECORD_INT8_TEXT; + if (text_double->value <= MAX_INT16) return RECORD_INT16_TEXT; + if (text_double->value <= MAX_INT32) return RECORD_INT32_TEXT; + return RECORD_INT64_TEXT; + } default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -729,6 +741,11 @@ static INT64 get_text_value_int( const WS_XML_TEXT *text ) const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text; return text_uint64->value; } + case WS_XML_TEXT_TYPE_DOUBLE: + { + const WS_XML_DOUBLE_TEXT *text_double = (const WS_XML_DOUBLE_TEXT *)text; + return text_double->value; + } default: ERR( "unhandled text type %u\n", text->textType ); assert(0); @@ -827,6 +844,13 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, (const BYTE *)&text_uint64->value, sizeof(text_uint64->value) ); return S_OK; } + case RECORD_DOUBLE_TEXT: + { + WS_XML_DOUBLE_TEXT *text_double = (WS_XML_DOUBLE_TEXT *)text; + if ((hr = write_grow_buffer( writer, sizeof(text_double->value) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&text_double->value, sizeof(text_double->value) ); + return S_OK; + } default: ERR( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2445,6 +2469,18 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) if (text_uint64->value <= MAX_INT64) return RECORD_INT64_TEXT_WITH_ENDELEMENT; return RECORD_UINT64_TEXT_WITH_ENDELEMENT; } + case WS_XML_TEXT_TYPE_DOUBLE: + { + const WS_XML_DOUBLE_TEXT *text_double = (const WS_XML_DOUBLE_TEXT *)text; + if (!text_double->value) return RECORD_ZERO_TEXT_WITH_ENDELEMENT; + if (text_double->value == 1) return RECORD_ONE_TEXT_WITH_ENDELEMENT; + if (isinf( text_double->value ) || (INT64)text_double->value != text_double->value) + return RECORD_DOUBLE_TEXT_WITH_ENDELEMENT; + if (text_double->value <= MAX_INT8) return RECORD_INT8_TEXT_WITH_ENDELEMENT; + if (text_double->value <= MAX_INT16) return RECORD_INT16_TEXT_WITH_ENDELEMENT; + if (text_double->value <= MAX_INT32) return RECORD_INT32_TEXT_WITH_ENDELEMENT; + return RECORD_INT64_TEXT_WITH_ENDELEMENT; + } default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2577,6 +2613,14 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U write_bytes( writer, (const BYTE *)&text_uint64->value, sizeof(text_uint64->value) ); return S_OK; } + case RECORD_DOUBLE_TEXT_WITH_ENDELEMENT: + { + WS_XML_DOUBLE_TEXT *text_double = (WS_XML_DOUBLE_TEXT *)text; + if ((hr = write_grow_buffer( writer, 1 + sizeof(text_double->value) )) != S_OK) return hr; + write_char( writer, type ); + write_bytes( writer, (const BYTE *)&text_double->value, sizeof(text_double->value) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -3063,6 +3107,29 @@ static HRESULT write_type_uint64( struct writer *writer, WS_TYPE_MAPPING mapping return write_type_text( writer, mapping, &text_uint64.text ); } +static HRESULT write_type_double( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_DOUBLE_DESCRIPTION *desc, WS_WRITE_OPTION option, + const void *value, ULONG size ) +{ + WS_XML_DOUBLE_TEXT text_double; + const double *ptr; + HRESULT hr; + + if (desc) + { + FIXME( "description not supported\n" ); + return E_NOTIMPL; + } + + if (!option || option == WS_WRITE_NILLABLE_VALUE) return E_INVALIDARG; + if ((hr = get_value_ptr( option, value, size, sizeof(double), (const void **)&ptr )) != S_OK) return hr; + if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); + + text_double.text.textType = WS_XML_TEXT_TYPE_DOUBLE; + text_double.value = *ptr; + return write_type_text( writer, mapping, &text_double.text ); +} + static HRESULT write_type_datetime( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_DATETIME_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) @@ -3580,6 +3647,9 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_UINT64_TYPE: return write_type_uint64( writer, mapping, desc, option, value, size ); + case WS_DOUBLE_TYPE: + return write_type_double( writer, mapping, desc, option, value, size ); + case WS_DATETIME_TYPE: return write_type_datetime( writer, mapping, desc, option, value, size );

1 0

Piotr Caban : msvcp90: Remove special handling of directories in tr2::sys: :_File_size.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 86b00a5aa208530b2ff9e36c811ba390e61a560d URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b00a5aa208530b2ff9e36c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 12 11:28:30 2017 +0200 msvcp90: Remove special handling of directories in tr2::sys::_File_size. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9d62454..9b0b7fe 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14673,8 +14673,6 @@ ULONGLONG __cdecl tr2_sys__File_size(char const* path) TRACE("(%s)\n", debugstr_a(path)); if(!GetFileAttributesExA(path, GetFileExInfoStandard, &fad)) return 0; - if(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - return 0; return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; } @@ -15465,8 +15463,6 @@ ULONGLONG __cdecl tr2_sys__File_size_wchar(WCHAR const* path) TRACE("(%s)\n", debugstr_w(path)); if(!GetFileAttributesExW(path, GetFileExInfoStandard, &fad)) return 0; - if(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - return 0; return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; }

1 0

Jacek Caban : winhttp/tests: Make notification tests more strict.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: bbb2f363a0d8a1503d1faebe67c294fe0bc07847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb2f363a0d8a1503d1faebe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 11 15:09:17 2017 +0200 winhttp/tests: Make notification tests more strict. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 200 +++++++++++++++++++------------------- 1 file changed, 101 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbb2f363a0d8a1503d1fa…

1 0

Alexandre Julliard : gdi32: Avoid having the source alpha channel interfere with color comparisons in GdiTransparentBlt.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 474f9ff1fa2ebf4ae6c4ef3b0d4987062b30d838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474f9ff1fa2ebf4ae6c4ef3b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 11:43:50 2017 +0200 gdi32: Avoid having the source alpha channel interfere with color comparisons in GdiTransparentBlt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 3d8c128..1b057f7 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -857,7 +857,19 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, if(oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) SetStretchBltMode(hdcSrc, COLORONCOLOR); hdcWork = CreateCompatibleDC(hdcDest); - bmpWork = CreateCompatibleBitmap(hdcDest, widthDest, heightDest); + if (GetObjectType( hdcDest ) != OBJ_MEMDC && GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) + { + /* screen DCs are not supposed to have an alpha channel, so use a 24-bpp bitmap as copy */ + BITMAPINFO info; + info.bmiHeader.biSize = sizeof(info.bmiHeader); + info.bmiHeader.biWidth = widthDest; + info.bmiHeader.biHeight = heightDest; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 24; + info.bmiHeader.biCompression = BI_RGB; + bmpWork = CreateDIBSection( 0, &info, DIB_RGB_COLORS, NULL, NULL, 0 ); + } + else bmpWork = CreateCompatibleBitmap(hdcDest, widthDest, heightDest); oldWork = SelectObject(hdcWork, bmpWork); if(!StretchBlt(hdcWork, 0, 0, widthDest, heightDest, hdcSrc, xSrc, ySrc, widthSrc, heightSrc, SRCCOPY)) { TRACE("Failed to stretch\n");

1 0

Hans Leidekker : webservices: Handle all supported native text types in the reader type conversion.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: f1f510d947e8261ef3f094247fe48f5ee98bb804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f510d947e8261ef3f094247… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:29 2017 +0200 webservices: Handle all supported native text types in the reader type conversion. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 674 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 516 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1f510d947e8261ef3f09…

1 0

Kimmo Myllyvirta : ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 32334704e882eb225b4738a34d46c6407af12514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32334704e882eb225b4738a34… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Wed Jul 12 03:17:18 2017 +0000 ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f212ec2..3f4691f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4907,6 +4907,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID { TRACE("-> got %s\n", guid_funcs[i].name); *(void **)out_buff = guid_funcs[i].func_ptr; + total = sizeof(void *); break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index efe10b3..e975ea4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7677,6 +7677,7 @@ static void test_ConnectEx(void) goto end; } + bytesReturned = 0xdeadbeef; iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); if (iret) { @@ -7684,6 +7685,8 @@ static void test_ConnectEx(void) goto end; } + ok(bytesReturned == sizeof(pConnectEx), "expected sizeof(pConnectEx), got %u\n", bytesReturned); + bret = pConnectEx(INVALID_SOCKET, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "ConnectEx on invalid socket " "returned %d + errno %d\n", bret, WSAGetLastError());

1 0

Hans Leidekker : webservices: Add support for 16-bit length text records in the writer.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 7018ccd4bcfcd2221cbf75e78d7c500a2756ee5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7018ccd4bcfcd2221cbf75e78… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:30 2017 +0200 webservices: Add support for 16-bit length text records in the writer. 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/webservices_private.h | 13 ++++ dlls/webservices/writer.c | 121 +++++++++++++++++++++++---------- 3 files changed, 98 insertions(+), 49 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 88ad498..4aacaf7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3505,19 +3505,6 @@ static HRESULT str_to_bool( const unsigned char *str, ULONG len, BOOL *ret ) return S_OK; } -#define MAX_INT8 0x7f -#define MIN_INT8 (-MAX_INT8 - 1) -#define MAX_INT16 0x7fff -#define MIN_INT16 (-MAX_INT16 - 1) -#define MAX_INT32 0x7fffffff -#define MIN_INT32 (-MAX_INT32 - 1) -#define MAX_INT64 (((INT64)0x7fffffff << 32) | 0xffffffff) -#define MIN_INT64 (-MAX_INT64 - 1) -#define MAX_UINT8 0xff -#define MAX_UINT16 0xffff -#define MAX_UINT32 0xffffffff -#define MAX_UINT64 (((UINT64)0xffffffff << 32) | 0xffffffff) - static HRESULT str_to_int64( const unsigned char *str, ULONG len, INT64 min, INT64 max, INT64 *ret ) { BOOL negative = FALSE; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 38d5786..ddaf59e 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -338,6 +338,19 @@ enum record_type /* 0xbe ... 0xff reserved */ }; +#define MAX_INT8 0x7f +#define MIN_INT8 (-MAX_INT8 - 1) +#define MAX_INT16 0x7fff +#define MIN_INT16 (-MAX_INT16 - 1) +#define MAX_INT32 0x7fffffff +#define MIN_INT32 (-MAX_INT32 - 1) +#define MAX_INT64 (((INT64)0x7fffffff << 32) | 0xffffffff) +#define MIN_INT64 (-MAX_INT64 - 1) +#define MAX_UINT8 0xff +#define MAX_UINT16 0xffff +#define MAX_UINT32 0xffffffff +#define MAX_UINT64 (((UINT64)0xffffffff << 32) | 0xffffffff) + #define TICKS_PER_SEC 10000000 #define TICKS_PER_MIN (60 * (ULONGLONG)TICKS_PER_SEC) #define TICKS_PER_HOUR (3600 * (ULONGLONG)TICKS_PER_SEC) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 8ce59a1..5f16623 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -649,17 +649,27 @@ static HRESULT write_dict_string( struct writer *writer, ULONG id ) return S_OK; } -static enum record_type get_text_record_type( const WS_XML_TEXT *text, BOOL attr ) +static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) { - const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text; - if (!utf8 || utf8->value.length <= 0xff) return attr ? RECORD_CHARS8_TEXT : RECORD_CHARS8_TEXT_WITH_ENDELEMENT; - return 0; -}; + if (!text) return RECORD_CHARS8_TEXT; + switch (text->textType) + { + case WS_XML_TEXT_TYPE_UTF8: + { + const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; + if (text_utf8->value.length <= MAX_UINT8) return RECORD_CHARS8_TEXT; + if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT; + return RECORD_CHARS32_TEXT; + } + default: + FIXME( "unhandled text type %u\n", text->textType ); + return 0; + } +} static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TEXT *text ) { - WS_XML_UTF8_TEXT *utf8 = (WS_XML_UTF8_TEXT *)text; - enum record_type type = get_text_record_type( text, TRUE ); + enum record_type type = get_attr_text_record_type( text ); HRESULT hr; if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; @@ -668,19 +678,31 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE switch (type) { case RECORD_CHARS8_TEXT: - if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; - if (!utf8 || !utf8->value.length) write_char( writer, 0 ); - else + { + WS_XML_UTF8_TEXT *text_utf8 = (WS_XML_UTF8_TEXT *)text; + if (!text_utf8) { - write_char( writer, utf8->value.length ); - if ((hr = write_grow_buffer( writer, utf8->value.length )) != S_OK) return hr; - write_bytes( writer, utf8->value.bytes, utf8->value.length ); + if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; + write_char( writer, 0 ); + return S_OK; } + if ((hr = write_grow_buffer( writer, 1 + text_utf8->value.length )) != S_OK) return hr; + write_char( writer, text_utf8->value.length ); + write_bytes( writer, text_utf8->value.bytes, text_utf8->value.length ); return S_OK; - + } + case RECORD_CHARS16_TEXT: + { + WS_XML_UTF8_TEXT *text_utf8 = (WS_XML_UTF8_TEXT *)text; + UINT16 len = text_utf8->value.length; + if ((hr = write_grow_buffer( writer, sizeof(len) + len )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&len, sizeof(len) ); + write_bytes( writer, text_utf8->value.bytes, len ); + return S_OK; + } default: ERR( "unhandled record type %02x\n", type ); - return WS_E_NOT_SUPPORTED; + return E_NOTIMPL; } } @@ -2040,15 +2062,16 @@ static HRESULT text_to_text( const WS_XML_TEXT *text, const WS_XML_TEXT *old, UL case WS_XML_TEXT_TYPE_UTF16: { const WS_XML_UTF16_TEXT *utf16 = (const WS_XML_UTF16_TEXT *)text; - const WS_XML_UTF16_TEXT *utf16_old = (const WS_XML_UTF16_TEXT *)old; - WS_XML_UTF16_TEXT *new; - ULONG len = utf16->byteCount / sizeof(WCHAR); - ULONG len_old = utf16_old ? utf16_old->byteCount / sizeof(WCHAR) : 0; - - if (len % sizeof(WCHAR)) return E_INVALIDARG; - if (!(new = alloc_utf16_text( NULL, len_old + len ))) return E_OUTOFMEMORY; - if (old) memcpy( new->bytes, utf16_old->bytes, len_old ); - memcpy( new->bytes + len_old, utf16->bytes, len ); + const WS_XML_UTF8_TEXT *utf8_old = (const WS_XML_UTF8_TEXT *)old; + WS_XML_UTF8_TEXT *new; + const WCHAR *str = (const WCHAR *)utf16->bytes; + ULONG len = utf16->byteCount / sizeof(WCHAR), len_utf8, len_old = utf8_old ? utf8_old->value.length : 0; + + if (utf16->byteCount % sizeof(WCHAR)) return E_INVALIDARG; + len_utf8 = WideCharToMultiByte( CP_UTF8, 0, str, len, NULL, 0, NULL, NULL ); + if (!(new = alloc_utf8_text( NULL, len_old + len_utf8 ))) return E_OUTOFMEMORY; + if (old) memcpy( new->value.bytes, utf8_old->value.bytes, len_old ); + WideCharToMultiByte( CP_UTF8, 0, str, len, (char *)new->value.bytes + len_old, len_utf8, NULL, NULL ); if (offset) *offset = len_old; *ret = &new->text; return S_OK; @@ -2266,35 +2289,61 @@ static HRESULT write_text_text( struct writer *writer, const WS_XML_TEXT *text, return WS_E_INVALID_FORMAT; } +static enum record_type get_text_record_type( const WS_XML_TEXT *text ) +{ + switch (text->textType) + { + case WS_XML_TEXT_TYPE_UTF8: + { + const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; + if (text_utf8->value.length <= MAX_UINT8) return RECORD_CHARS8_TEXT_WITH_ENDELEMENT; + if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT_WITH_ENDELEMENT; + return RECORD_CHARS32_TEXT_WITH_ENDELEMENT; + } + default: + FIXME( "unhandled text type %u\n", text->textType ); + return 0; + } +} + static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, ULONG offset ) { - const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text; - enum record_type type = get_text_record_type( text, FALSE ); + enum record_type type = get_text_record_type( text ); HRESULT hr; if (offset) { FIXME( "no support for appending text in binary mode\n" ); - return WS_E_NOT_SUPPORTED; + return E_NOTIMPL; } switch (type) { case RECORD_CHARS8_TEXT_WITH_ENDELEMENT: - if ((hr = write_grow_buffer( writer, 2 )) != S_OK) return hr; + { + const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; + UINT8 len = text_utf8->value.length; + + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; write_char( writer, type ); - if (!utf8 || !utf8->value.length) write_char( writer, 0 ); - else - { - write_char( writer, utf8->value.length ); - if ((hr = write_grow_buffer( writer, utf8->value.length )) != S_OK) return hr; - write_bytes( writer, utf8->value.bytes, utf8->value.length ); - } + write_char( writer, len ); + write_bytes( writer, text_utf8->value.bytes, len ); return S_OK; + } + case RECORD_CHARS16_TEXT_WITH_ENDELEMENT: + { + const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; + UINT16 len = text_utf8->value.length; + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; + write_char( writer, type ); + write_bytes( writer, (const BYTE *)&len, sizeof(len) ); + write_bytes( writer, text_utf8->value.bytes, len ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); - return WS_E_NOT_SUPPORTED; + return E_NOTIMPL; } }

1 0

Rosanne DiMesio : Change distribution to operating system in places visible to users
by Jeremy Newman July 12, 2017

July 12, 2017

Module: appdb Branch: master Commit: d4907a77b42b72cbce5e49f0d4bde6007ec36d39 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d4907a77b42b72cbce5e49f0… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jul 12 14:47:47 2017 -0500 Change distribution to operating system in places visible to users Distribution is a Linuxism that makes no sense for users of other operating systems, and even many new Linux users are unfamiliar with the term: some users try to add the name of a distributor or version to the distribution field. Operating system is more accurate and less likely to confuse users. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/distribution.php | 60 +++++++++++++++++++++++----------------------- include/sidebar.php | 2 +- include/testData.php | 8 +++---- include/testData_queue.php | 4 ++-- 4 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=d4907a77b42b72cbce5e…

1 0

Rosanne DiMesio : Do not show preview button on new, unqueued test reports
by Jeremy Newman July 12, 2017

July 12, 2017

Module: appdb Branch: master Commit: ad993f6e0284f986ffbed65b5afbbcdec0688246 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ad993f6e0284f986ffbed65b… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jul 12 10:07:02 2017 -0500 Do not show preview button on new, unqueued test reports Preview can display incorrect or missing information when run on test reports that have not yet been submitted/queued. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData_queue.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/testData_queue.php b/include/testData_queue.php index 0877535..23a09a4 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -180,7 +180,10 @@ class testData_queue function objectShowPreview() { - return $this->oTestData->objectShowPreview(); + if(!$this->oTestData->iTestingId) + return FALSE; + else + return $this->oTestData->objectShowPreview(); } function display()

1 0