wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Sebastian Lackner : reg/tests: Don' t call RegCloseKey on uninitialized memory.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: db11f739ea73d7c2d7d6cc09c5a40cc8b0d76dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db11f739ea73d7c2d7d6cc09c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 12 15:03:19 2017 +0200 reg/tests: Don't call RegCloseKey on uninitialized memory. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index af09290..941d325 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -793,7 +793,7 @@ static void test_import(void) DWORD r, dword = 0x123, type, size; char test1_reg[MAX_PATH], test2_reg[MAX_PATH], cmdline[MAX_PATH]; char test_string[] = "Test string", buffer[24]; - HKEY hkey, subkey; + HKEY hkey, subkey = NULL; LONG err; BYTE hex[8];

1 0

Sebastian Lackner : webservices: Remove dead code in read_attribute_value_bin.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: f53b6bfde09f5f0d7893fe788f2556b1697702d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53b6bfde09f5f0d7893fe788… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 12 15:02:43 2017 +0200 webservices: Remove dead code in read_attribute_value_bin. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 63de1ad..6d1d68f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1582,11 +1582,6 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE return WS_E_NOT_SUPPORTED; } - if (type >= RECORD_INT8_TEXT && type <= RECORD_INT64_TEXT) - { - attr->value = &text_int64->text; - return S_OK; - } if (type >= RECORD_BYTES8_TEXT && type <= RECORD_BYTES32_TEXT) { attr->value = &text_base64->text;

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 35de20a8b3d48debf5753999021758a2fc040ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35de20a8b3d48debf57539990… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:38 2017 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 520 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 520 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35de20a8b3d48debf5753…

1 0

Hans Leidekker : webservices: Add support for DATETIME records in the writer.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: dbe2163d43733a940de200733ff8ffb11ab1fdcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe2163d43733a940de200733… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:37 2017 +0200 webservices: Add support for DATETIME 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 | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e262254..2071a95 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -722,6 +722,9 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_UNIQUE_ID: return RECORD_UNIQUE_ID_TEXT; + case WS_XML_TEXT_TYPE_DATETIME: + return RECORD_DATETIME_TEXT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -871,6 +874,19 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); return S_OK; } + case RECORD_DATETIME_TEXT: + { + WS_XML_DATETIME_TEXT *text_datetime = (WS_XML_DATETIME_TEXT *)text; + UINT64 val = text_datetime->value.ticks; + + assert( val <= TICKS_MAX ); + if (text_datetime->value.format == WS_DATETIME_FORMAT_UTC) val |= (UINT64)1 << 62; + else if (text_datetime->value.format == WS_DATETIME_FORMAT_LOCAL) val |= (UINT64)1 << 63; + + if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&val, sizeof(val) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2507,6 +2523,9 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_UNIQUE_ID: return RECORD_UNIQUE_ID_TEXT_WITH_ENDELEMENT; + case WS_XML_TEXT_TYPE_DATETIME: + return RECORD_DATETIME_TEXT_WITH_ENDELEMENT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2663,6 +2682,20 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); return S_OK; } + case RECORD_DATETIME_TEXT_WITH_ENDELEMENT: + { + WS_XML_DATETIME_TEXT *text_datetime = (WS_XML_DATETIME_TEXT *)text; + UINT64 val = text_datetime->value.ticks; + + assert( val <= TICKS_MAX ); + if (text_datetime->value.format == WS_DATETIME_FORMAT_UTC) val |= (UINT64)1 << 62; + else if (text_datetime->value.format == WS_DATETIME_FORMAT_LOCAL) val |= (UINT64)1 << 63; + + if ((hr = write_grow_buffer( writer, 1 + sizeof(val) )) != S_OK) return hr; + write_char( writer, type ); + write_bytes( writer, (const BYTE *)&val, sizeof(val) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -3176,8 +3209,7 @@ static HRESULT write_type_datetime( struct writer *writer, WS_TYPE_MAPPING mappi const WS_DATETIME_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { - WS_XML_UTF8_TEXT utf8; - unsigned char buf[34]; /* "0000-00-00T00:00:00.0000000-00:00" */ + WS_XML_DATETIME_TEXT text_datetime; const WS_DATETIME *ptr; HRESULT hr; @@ -3192,10 +3224,9 @@ static HRESULT write_type_datetime( struct writer *writer, WS_TYPE_MAPPING mappi if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); if (ptr->ticks > TICKS_MAX || ptr->format > WS_DATETIME_FORMAT_NONE) return WS_E_INVALID_FORMAT; - utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; - utf8.value.bytes = buf; - utf8.value.length = format_datetime( ptr, buf ); - return write_type_text( writer, mapping, &utf8.text ); + text_datetime.text.textType = WS_XML_TEXT_TYPE_DATETIME; + text_datetime.value = *ptr; + return write_type_text( writer, mapping, &text_datetime.text ); } static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping,

1 0

Hans Leidekker : webservices: Add support for UNIQUE_ID records in the writer.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: f40d88a0c757b4eac4b021752ea9f9bb9da5ec2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40d88a0c757b4eac4b021752… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:36 2017 +0200 webservices: Add support for UNIQUE_ID 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 | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e3b9214..e262254 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -719,6 +719,9 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_GUID: return RECORD_GUID_TEXT; + case WS_XML_TEXT_TYPE_UNIQUE_ID: + return RECORD_UNIQUE_ID_TEXT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -861,6 +864,13 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, (const BYTE *)&text_guid->value, sizeof(text_guid->value) ); return S_OK; } + case RECORD_UNIQUE_ID_TEXT: + { + WS_XML_UNIQUE_ID_TEXT *text_unique_id = (WS_XML_UNIQUE_ID_TEXT *)text; + if ((hr = write_grow_buffer( writer, sizeof(text_unique_id->value) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2494,6 +2504,9 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_GUID: return RECORD_GUID_TEXT_WITH_ENDELEMENT; + case WS_XML_TEXT_TYPE_UNIQUE_ID: + return RECORD_UNIQUE_ID_TEXT_WITH_ENDELEMENT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2642,6 +2655,14 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U write_bytes( writer, (const BYTE *)&text_guid->value, sizeof(text_guid->value) ); return S_OK; } + case RECORD_UNIQUE_ID_TEXT_WITH_ENDELEMENT: + { + WS_XML_UNIQUE_ID_TEXT *text_unique_id = (WS_XML_UNIQUE_ID_TEXT *)text; + if ((hr = write_grow_buffer( writer, 1 + sizeof(text_unique_id->value) )) != S_OK) return hr; + write_char( writer, type ); + write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -3204,9 +3225,8 @@ static HRESULT write_type_unique_id( struct writer *writer, WS_TYPE_MAPPING mapp const WS_UNIQUE_ID_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { - WS_XML_UTF8_TEXT utf8; - WS_XML_UTF16_TEXT utf16; - unsigned char buf[46]; /* "urn:uuid:00000000-0000-0000-0000-000000000000" */ + WS_XML_UNIQUE_ID_TEXT text_unique_id; + WS_XML_UTF16_TEXT text_utf16; const WS_UNIQUE_ID *ptr; HRESULT hr; @@ -3222,16 +3242,15 @@ static HRESULT write_type_unique_id( struct writer *writer, WS_TYPE_MAPPING mapp if (ptr->uri.length) { - utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; - utf16.bytes = (BYTE *)ptr->uri.chars; - utf16.byteCount = ptr->uri.length * sizeof(WCHAR); - return write_type_text( writer, mapping, &utf16.text ); + text_utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; + text_utf16.bytes = (BYTE *)ptr->uri.chars; + text_utf16.byteCount = ptr->uri.length * sizeof(WCHAR); + return write_type_text( writer, mapping, &text_utf16.text ); } - utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; - utf8.value.bytes = buf; - utf8.value.length = format_urn( &ptr->guid, buf ); - return write_type_text( writer, mapping, &utf8.text ); + text_unique_id.text.textType = WS_XML_TEXT_TYPE_UNIQUE_ID; + text_unique_id.value = ptr->guid; + return write_type_text( writer, mapping, &text_unique_id.text ); } static HRESULT write_type_string( struct writer *writer, WS_TYPE_MAPPING mapping,

1 0

Hans Leidekker : webservices: Add support for GUID records in the writer.
by Alexandre Julliard 12 Jul '17

12 Jul '17

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 12 Jul '17

12 Jul '17

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

Hans Leidekker : webservices: Add support for integer records in the writer.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: bfa4a6010bc4487aa44b13dafa90cc777cebcb42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa4a6010bc4487aa44b13daf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:33 2017 +0200 webservices: Add support for integer 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 | 271 +++++++++++++++++++++++++++++++++------------- 1 file changed, 198 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfa4a6010bc4487aa44b1…

1 0

Hans Leidekker : webservices: Add support for BOOL records in the writer.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: a2eb6d6f7e6a01f9343eea81e38bd4208d423b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2eb6d6f7e6a01f9343eea81e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:32 2017 +0200 webservices: Add support for BOOL 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 | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 40e549f..e6bee56 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -668,6 +668,11 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) if (text_base64->length <= MAX_UINT16) return RECORD_BYTES16_TEXT; return RECORD_BYTES32_TEXT; } + case WS_XML_TEXT_TYPE_BOOL: + { + const WS_XML_BOOL_TEXT *text_bool = (const WS_XML_BOOL_TEXT *)text; + return text_bool->value ? RECORD_TRUE_TEXT : RECORD_FALSE_TEXT; + } default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -724,6 +729,10 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, text_base64->bytes, len ); return S_OK; } + case RECORD_FALSE_TEXT: + case RECORD_TRUE_TEXT: + return S_OK; + default: ERR( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2332,6 +2341,11 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) if (len <= MAX_UINT16) return RECORD_BYTES16_TEXT; return RECORD_BYTES32_TEXT; } + case WS_XML_TEXT_TYPE_BOOL: + { + const WS_XML_BOOL_TEXT *text_bool = (const WS_XML_BOOL_TEXT *)text; + return text_bool->value ? RECORD_TRUE_TEXT_WITH_ENDELEMENT : RECORD_FALSE_TEXT_WITH_ENDELEMENT; + } default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2415,6 +2429,13 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U } return S_OK; } + case RECORD_FALSE_TEXT_WITH_ENDELEMENT: + case RECORD_TRUE_TEXT_WITH_ENDELEMENT: + { + if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; + write_char( writer, type ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2698,8 +2719,7 @@ static HRESULT write_type_bool( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_BOOL_DESCRIPTION *desc, WS_WRITE_OPTION option, const BOOL *value, ULONG size ) { - WS_XML_UTF8_TEXT utf8; - unsigned char buf[6]; /* "false" */ + WS_XML_BOOL_TEXT text_bool; const BOOL *ptr; HRESULT hr; @@ -2713,10 +2733,9 @@ static HRESULT write_type_bool( struct writer *writer, WS_TYPE_MAPPING mapping, if ((hr = get_value_ptr( option, value, size, sizeof(BOOL), (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_bool( ptr, buf ); - return write_type_text( writer, mapping, &utf8.text ); + text_bool.text.textType = WS_XML_TEXT_TYPE_BOOL; + text_bool.value = *ptr; + return write_type_text( writer, mapping, &text_bool.text ); } static HRESULT write_type_int8( struct writer *writer, WS_TYPE_MAPPING mapping,

1 0

Hans Leidekker : webservices: Add support for byte records in the writer.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 11028500a75906dc510da2cdaeb1055f68ce453e URL: http://source.winehq.org/git/wine.git/?a=commit;h=11028500a75906dc510da2cda… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:31 2017 +0200 webservices: Add support for byte 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 | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 5f16623..40e549f 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -661,6 +661,13 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT; return RECORD_CHARS32_TEXT; } + case WS_XML_TEXT_TYPE_BASE64: + { + const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; + if (text_base64->length <= MAX_UINT8) return RECORD_BYTES8_TEXT; + if (text_base64->length <= MAX_UINT16) return RECORD_BYTES16_TEXT; + return RECORD_BYTES32_TEXT; + } default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -700,6 +707,23 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, text_utf8->value.bytes, len ); return S_OK; } + case RECORD_BYTES8_TEXT: + { + WS_XML_BASE64_TEXT *text_base64 = (WS_XML_BASE64_TEXT *)text; + if ((hr = write_grow_buffer( writer, 1 + text_base64->length )) != S_OK) return hr; + write_char( writer, text_base64->length ); + write_bytes( writer, text_base64->bytes, text_base64->length ); + return S_OK; + } + case RECORD_BYTES16_TEXT: + { + WS_XML_BASE64_TEXT *text_base64 = (WS_XML_BASE64_TEXT *)text; + UINT16 len = text_base64->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_base64->bytes, len ); + return S_OK; + } default: ERR( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2300,6 +2324,14 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT_WITH_ENDELEMENT; return RECORD_CHARS32_TEXT_WITH_ENDELEMENT; } + case WS_XML_TEXT_TYPE_BASE64: + { + const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; + ULONG rem = text_base64->length % 3, len = text_base64->length - rem; + if (len <= MAX_UINT8) return RECORD_BYTES8_TEXT; + if (len <= MAX_UINT16) return RECORD_BYTES16_TEXT; + return RECORD_BYTES32_TEXT; + } default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2341,6 +2373,48 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U write_bytes( writer, text_utf8->value.bytes, len ); return S_OK; } + case RECORD_BYTES8_TEXT: + { + const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; + UINT8 rem = text_base64->length % 3, len = text_base64->length - rem; + + if (len) + { + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; + write_char( writer, rem ? RECORD_BYTES8_TEXT : RECORD_BYTES8_TEXT_WITH_ENDELEMENT ); + write_char( writer, len ); + write_bytes( writer, text_base64->bytes, len ); + } + if (rem) + { + if ((hr = write_grow_buffer( writer, 3 )) != S_OK) return hr; + write_char( writer, RECORD_BYTES8_TEXT_WITH_ENDELEMENT ); + write_char( writer, rem ); + write_bytes( writer, (const BYTE *)text_base64->bytes + len, rem ); + } + return S_OK; + } + case RECORD_BYTES16_TEXT: + { + const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; + UINT16 rem = text_base64->length % 3, len = text_base64->length - rem; + + if (len) + { + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; + write_char( writer, rem ? RECORD_BYTES16_TEXT : RECORD_BYTES16_TEXT_WITH_ENDELEMENT ); + write_bytes( writer, (const BYTE *)&len, sizeof(len) ); + write_bytes( writer, text_base64->bytes, len ); + } + if (rem) + { + if ((hr = write_grow_buffer( writer, 3 )) != S_OK) return hr; + write_char( writer, RECORD_BYTES8_TEXT_WITH_ENDELEMENT ); + write_char( writer, rem ); + write_bytes( writer, (const BYTE *)text_base64->bytes + len, rem ); + } + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL;

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017