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

Dmitry Timoshkov : cmd: '$E' in the prompt should be interpreted as an escape code (0x1b).
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 586e171d6fc81db670d290ebcc84fc467db7c49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=586e171d6fc81db670d290ebc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 21 16:24:11 2017 +0800 cmd: '$E' in the prompt should be interpreted as an escape code (0x1b). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1aa3c1c..102e485 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -379,7 +379,7 @@ static void WCMD_show_prompt (void) { while (*q) q++; break; case 'E': - *q++ = '\E'; + *q++ = '\x1b'; break; case 'F': *q++ = ')';

1 0

Zebediah Figura : quartz: Use nAvgBytesPerSec to calculate length.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: e994c62e3e66aebe137a3f2b15bdf3246fdaa08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e994c62e3e66aebe137a3f2b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 19 14:15:32 2017 -0500 quartz: Use nAvgBytesPerSec to calculate length. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 6 +++--- dlls/quartz/waveparser.c | 18 +++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9e8f69c..7902955 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -115,9 +115,9 @@ static REFERENCE_TIME time_from_pos(DSoundRenderImpl *This, DWORD pos) { static DWORD pos_from_time(DSoundRenderImpl *This, REFERENCE_TIME time) { WAVEFORMATEX *wfx = (WAVEFORMATEX*)This->renderer.pInputPin->pin.mtCurrent.pbFormat; REFERENCE_TIME ret = time; - ret *= wfx->nSamplesPerSec; + ret *= wfx->nAvgBytesPerSec; ret /= 10000000; - ret *= wfx->nBlockAlign; + ret -= ret % wfx->nBlockAlign; return ret; } @@ -424,7 +424,7 @@ static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_ TRACE("Format = %p\n", format); TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM); TRACE("nChannels = %d\n", format->nChannels); - TRACE("nSamplesPerSec = %d\n", format->nAvgBytesPerSec); + TRACE("nSamplesPerSec = %d\n", format->nSamplesPerSec); TRACE("nAvgBytesPerSec = %d\n", format->nAvgBytesPerSec); TRACE("nBlockAlign = %d\n", format->nBlockAlign); TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 6e8c664..f6bea2c 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -43,9 +43,8 @@ typedef struct WAVEParserImpl ParserImpl Parser; LONGLONG StartOfFile; /* in media time */ LONGLONG EndOfFile; - DWORD dwSampleSize; - DWORD nSamplesPerSec; - DWORD dwLength; + DWORD nAvgBytesPerSec; + DWORD nBlockAlign; } WAVEParserImpl; static inline WAVEParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) @@ -62,7 +61,7 @@ static LONGLONG bytepos_to_duration(WAVEParserImpl *This, LONGLONG bytepos) { LONGLONG duration = BYTES_FROM_MEDIATIME(bytepos - This->StartOfFile); duration *= 10000000; - duration /= (This->dwSampleSize * This->nSamplesPerSec); + duration /= This->nAvgBytesPerSec; return duration; } @@ -71,11 +70,11 @@ static LONGLONG duration_to_bytepos(WAVEParserImpl *This, LONGLONG duration) { LONGLONG bytepos; - bytepos = (This->dwSampleSize * This->nSamplesPerSec); + bytepos = This->nAvgBytesPerSec; bytepos *= duration; bytepos /= 10000000; + bytepos -= bytepos % This->nBlockAlign; bytepos += BYTES_FROM_MEDIATIME(This->StartOfFile); - bytepos -= bytepos % This->dwSampleSize; return MEDIATIME_FROM_BYTES(bytepos); } @@ -252,7 +251,6 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, PIN_INFO piOutput; AM_MEDIA_TYPE amt; WAVEParserImpl * pWAVEParser = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - LONGLONG length, avail; piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &pWAVEParser->Parser.filter.IBaseFilter_iface; @@ -321,10 +319,8 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, props->cbPrefix = 0; props->cbBuffer = 4096; props->cBuffers = 3; - pWAVEParser->dwSampleSize = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; - IAsyncReader_Length(This->pReader, &length, &avail); - pWAVEParser->dwLength = length / (ULONGLONG)pWAVEParser->dwSampleSize; - pWAVEParser->nSamplesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nSamplesPerSec; + pWAVEParser->nBlockAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; + pWAVEParser->nAvgBytesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nAvgBytesPerSec; hr = Parser_AddPin(&(pWAVEParser->Parser), &piOutput, props, &amt); CoTaskMemFree(amt.pbFormat);

1 0

Hans Leidekker : webservices: Add support for reading WS_XML_STRING values.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: db6476f0aea58973fa9f8fc7aaefc1eeb14d296e URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6476f0aea58973fa9f8fc7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:41 2017 +0200 webservices: Add support for reading WS_XML_STRING values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 69 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 11 +++++-- 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4b2706b..dbe993b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3663,6 +3663,18 @@ static HRESULT str_to_bytes( const unsigned char *str, ULONG len, WS_HEAP *heap, return S_OK; } +static HRESULT str_to_xml_string( const unsigned char *str, ULONG len, WS_HEAP *heap, WS_XML_STRING *ret ) +{ + const unsigned char *p = str; + + if (!(ret->bytes = ws_alloc( heap, len ))) return WS_E_QUOTA_EXCEEDED; + memcpy( ret->bytes, p, len ); + ret->length = len; + ret->dictionary = NULL; + ret->id = 0; + return S_OK; +} + static const int month_offsets[2][12] = { {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}, @@ -4882,6 +4894,58 @@ static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static HRESULT read_type_xml_string( struct reader *reader, WS_TYPE_MAPPING mapping, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + const WS_XML_STRING_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *ret, ULONG size ) +{ + WS_XML_UTF8_TEXT *utf8; + WS_XML_STRING val = {0}; + HRESULT hr; + BOOL found; + + if (desc) FIXME( "ignoring description\n" ); + + if ((hr = read_get_text( reader, mapping, localname, ns, &utf8, &found )) != S_OK) return hr; + if (found && (hr = str_to_xml_string( utf8->value.bytes, utf8->value.length, heap, &val )) != S_OK) + return hr; + + switch (option) + { + case WS_READ_REQUIRED_VALUE: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_NILLABLE_VALUE: + if (size != sizeof(val)) return E_INVALIDARG; + *(WS_XML_STRING *)ret = val; + break; + + case WS_READ_REQUIRED_POINTER: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_OPTIONAL_POINTER: + case WS_READ_NILLABLE_POINTER: + { + WS_XML_STRING *heap_val = NULL; + if (size != sizeof(heap_val)) return E_INVALIDARG; + if (found) + { + if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; + *heap_val = val; + } + *(WS_XML_STRING **)ret = heap_val; + 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; @@ -5468,6 +5532,11 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return hr; break; + case WS_XML_STRING_TYPE: + if ((hr = read_type_xml_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) + return hr; + break; + case WS_STRUCT_TYPE: if ((hr = read_type_struct( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) return hr; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index bbb899e..d528eca 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1379,8 +1379,7 @@ static void test_WsReadType(void) WS_XML_READER *reader; WS_HEAP *heap; enum { ONE = 1, TWO = 2 }; - WS_XML_STRING one = { 3, (BYTE *)"ONE" }; - WS_XML_STRING two = { 3, (BYTE *)"TWO" }; + WS_XML_STRING one = { 3, (BYTE *)"ONE" }, two = { 3, (BYTE *)"TWO" }, val_xmlstr; WS_ENUM_VALUE enum_values[] = { { ONE, &one }, { TWO, &two } }; WS_ENUM_DESCRIPTION enum_desc; int val_enum; @@ -1696,6 +1695,14 @@ static void test_WsReadType(void) ok( val_str != NULL, "pointer not set\n" ); if (val_str) ok( !lstrcmpW( val_str, utf8W ), "wrong data %s\n", wine_dbgstr_w(val_str) ); + memset( &val_xmlstr, 0, sizeof(val_xmlstr) ); + prepare_type_test( reader, "<t> test </t>", sizeof("<t> test </t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_XML_STRING_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_xmlstr, sizeof(val_xmlstr), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val_xmlstr.length == 6, "got %u\n", val_xmlstr.length ); + ok( !memcmp( val_xmlstr.bytes, " test ", 6 ), "wrong data\n" ); + memset( &val_string, 0, sizeof(val_string) ); prepare_type_test( reader, "<t> test </t>", sizeof("<t> test </t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRING_TYPE, NULL,

1 0

Hans Leidekker : webservices: Add support for writing WS_XML_QNAME values.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: f07f21cafe2f24dc98e7453882bcf253559ff7d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07f21cafe2f24dc98e745388… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:38 2017 +0200 webservices: Add support for writing WS_XML_QNAME values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 22 +++++++- dlls/webservices/writer.c | 120 +++++++++++++++++++++++++++++----------- include/webservices.h | 19 +++++++ 3 files changed, 128 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f07f21cafe2f24dc98e74…

1 0

Hans Leidekker : webservices: Add support for reading WS_UNIQUE_ID values.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 164024eaa9692c0e9718318d6929581bbd2ef067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=164024eaa9692c0e9718318d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:40 2017 +0200 webservices: Add support for reading WS_UNIQUE_ID values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 70 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 36 +++++++++++++++------ 2 files changed, 97 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7a0064e..4b2706b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3578,6 +3578,19 @@ static HRESULT str_to_string( const unsigned char *str, ULONG len, WS_HEAP *heap return S_OK; } +static HRESULT str_to_unique_id( const unsigned char *str, ULONG len, WS_HEAP *heap, WS_UNIQUE_ID *ret ) +{ + if (len == 45 && !memcmp( str, "urn:uuid:", 9 )) + { + ret->uri.length = 0; + ret->uri.chars = NULL; + return str_to_guid( str + 9, len - 9, &ret->guid ); + } + + memset( &ret->guid, 0, sizeof(ret->guid) ); + return str_to_string( str, len, heap, &ret->uri ); +} + static inline unsigned char decode_char( unsigned char c ) { if (c >= 'A' && c <= 'Z') return c - 'A'; @@ -4714,6 +4727,57 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static HRESULT read_type_unique_id( struct reader *reader, WS_TYPE_MAPPING mapping, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + const WS_UNIQUE_ID_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *ret, ULONG size ) +{ + WS_XML_UTF8_TEXT *utf8; + WS_UNIQUE_ID val = {{0}}; + HRESULT hr; + BOOL found; + + if (desc) FIXME( "ignoring description\n" ); + + if ((hr = read_get_text( reader, mapping, localname, ns, &utf8, &found )) != S_OK) return hr; + if (found && (hr = str_to_unique_id( utf8->value.bytes, utf8->value.length, heap, &val )) != S_OK) return hr; + + switch (option) + { + case WS_READ_REQUIRED_VALUE: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_NILLABLE_VALUE: + if (size != sizeof(val)) return E_INVALIDARG; + *(WS_UNIQUE_ID *)ret = val; + break; + + case WS_READ_REQUIRED_POINTER: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_OPTIONAL_POINTER: + case WS_READ_NILLABLE_POINTER: + { + WS_UNIQUE_ID *heap_val = NULL; + if (size != sizeof(heap_val)) return E_INVALIDARG; + if (found) + { + if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; + *heap_val = val; + } + *(WS_UNIQUE_ID **)ret = heap_val; + break; + } + default: + FIXME( "read option %u not supported\n", option ); + return E_NOTIMPL; + } + + return S_OK; +} + static HRESULT read_type_string( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_STRING_DESCRIPTION *desc, WS_READ_OPTION option, @@ -4976,6 +5040,7 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) case WS_DOUBLE_TYPE: case WS_DATETIME_TYPE: case WS_GUID_TYPE: + case WS_UNIQUE_ID_TYPE: case WS_STRING_TYPE: case WS_BYTES_TYPE: case WS_XML_STRING_TYPE: @@ -5383,6 +5448,11 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return hr; break; + case WS_UNIQUE_ID_TYPE: + if ((hr = read_type_unique_id( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) + return hr; + break; + case WS_STRING_TYPE: if ((hr = read_type_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) return hr; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index c5809db..bbb899e 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -22,6 +22,8 @@ #include "webservices.h" #include "wine/test.h" +static const GUID guid_null; + static const char data1[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; @@ -1360,9 +1362,6 @@ static void prepare_type_test( WS_XML_READER *reader, const char *data, ULONG si hr = set_input( reader, data, size ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsFillReader( reader, size, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1373,8 +1372,7 @@ static void prepare_type_test( WS_XML_READER *reader, const char *data, ULONG si static void test_WsReadType(void) { static const WCHAR testW[] = {'t','e','s','t',0}, test2W[] = {' ','t','e','s','t',' '}; - static const GUID guid1 = {0,0,0,{0,0,0,0,0,0,0,0}}; - static const GUID guid2 = {0,0,0,{0,0,0,0,0,0,0,0xa1}}; + static const GUID guid = {0,0,0,{0,0,0,0,0,0,0,0xa1}}; static const char utf8[] = {'<','t','>',0xe2,0x80,0x99,'<','/','t','>'}; static const WCHAR utf8W[] = {0x2019,0}; HRESULT hr; @@ -1399,6 +1397,7 @@ static void test_WsReadType(void) GUID val_guid; WS_BYTES val_bytes; WS_STRING val_string; + WS_UNIQUE_ID val_id; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1650,7 +1649,7 @@ static void test_WsReadType(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( IsEqualGUID( &val_guid, &guid1 ), "wrong guid\n" ); + ok( IsEqualGUID( &val_guid, &guid_null ), "wrong guid\n" ); memset( &val_guid, 0, sizeof(val_guid) ); prepare_type_test( reader, "<t>00000000-0000-0000-0000-0000000000a1</t>", @@ -1658,7 +1657,7 @@ static void test_WsReadType(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( IsEqualGUID( &val_guid, &guid2 ), "wrong guid\n" ); + ok( IsEqualGUID( &val_guid, &guid ), "wrong guid\n" ); memset( &val_guid, 0, sizeof(val_guid) ); prepare_type_test( reader, "<t>00000000-0000-0000-0000-0000000000A1</t>", @@ -1666,7 +1665,7 @@ static void test_WsReadType(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( IsEqualGUID( &val_guid, &guid2 ), "wrong guid\n" ); + ok( IsEqualGUID( &val_guid, &guid ), "wrong guid\n" ); memset( &val_bytes, 0, sizeof(val_bytes) ); prepare_type_test( reader, "<t>dGVzdA==</t>", sizeof("<t>dGVzdA==</t>") - 1 ); @@ -1705,6 +1704,26 @@ static void test_WsReadType(void) ok( val_string.length == 6, "got %u\n", val_string.length ); ok( !memcmp( val_string.chars, test2W, sizeof(test2W) ), "wrong data\n" ); + memset( &val_id, 0, sizeof(val_id) ); + val_id.guid.Data1 = 0xdeadbeef; + prepare_type_test( reader, "<t> test </t>", sizeof("<t> test </t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_id, sizeof(val_id), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val_id.uri.length == 6, "got %u\n", val_string.length ); + ok( !memcmp( val_id.uri.chars, test2W, sizeof(test2W) ), "wrong data\n" ); + ok( IsEqualGUID( &val_id.guid, &guid_null ), "wrong guid\n" ); + + memset( &val_id, 0, sizeof(val_id) ); + prepare_type_test( reader, "<t>urn:uuid:00000000-0000-0000-0000-0000000000a1</t>", + sizeof("<t>urn:uuid:00000000-0000-0000-0000-0000000000a1</t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_id, sizeof(val_id), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !val_id.uri.length, "got %u\n", val_string.length ); + ok( val_id.uri.chars == NULL, "chars set %s\n", wine_dbgstr_wn(val_id.uri.chars, val_id.uri.length) ); + ok( IsEqualGUID( &val_id.guid, &guid ), "wrong guid\n" ); + WsFreeReader( reader ); WsFreeHeap( heap ); } @@ -3842,7 +3861,6 @@ static void test_field_options(void) static const char xml[] = "<t xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"><wsz i:nil=\"true\"/>" "<s i:nil=\"true\"/></t>"; - static const GUID guid_null = {0}; HRESULT hr; WS_HEAP *heap; WS_XML_READER *reader;

1 0

Hans Leidekker : webservices: Add support for reading WS_STRING values.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 9fa4ed7860a1ac52352b5281a07bf80c07bfe4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa4ed7860a1ac52352b5281a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:39 2017 +0200 webservices: Add support for reading WS_STRING values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 86 +++++++++++++++++++++++++++++++++++++---- dlls/webservices/tests/reader.c | 11 +++++- 2 files changed, 88 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 2dad976..7a0064e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3565,6 +3565,19 @@ static HRESULT str_to_guid( const unsigned char *str, ULONG len, GUID *ret ) return S_OK; } +static HRESULT str_to_string( const unsigned char *str, ULONG len, WS_HEAP *heap, WS_STRING *ret ) +{ + const unsigned char *p = str; + int len_utf16; + + len_utf16 = MultiByteToWideChar( CP_UTF8, 0, (const char *)p, len, NULL, 0 ); + if (!(ret->chars = ws_alloc( heap, len_utf16 * sizeof(WCHAR) ))) return WS_E_QUOTA_EXCEEDED; + MultiByteToWideChar( CP_UTF8, 0, (const char *)p, len, ret->chars, len_utf16 ); + ret->length = len_utf16; + + return S_OK; +} + static inline unsigned char decode_char( unsigned char c ) { if (c >= 'A' && c <= 'Z') return c - 'A'; @@ -3976,7 +3989,7 @@ static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(BOOL)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(BOOL *)ret = val; break; @@ -4196,7 +4209,7 @@ static HRESULT read_type_int64( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(INT64)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(INT64 *)ret = val; break; @@ -4416,7 +4429,7 @@ static HRESULT read_type_uint64( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(UINT64)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(UINT64 *)ret = val; break; @@ -4467,7 +4480,7 @@ static HRESULT read_type_double( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(double)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(double *)ret = val; break; @@ -4570,7 +4583,7 @@ static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(int)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(int *)ret = val; break; @@ -4621,7 +4634,7 @@ static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mappin /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(WS_DATETIME)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(WS_DATETIME *)ret = val; break; @@ -4672,7 +4685,7 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(GUID)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(GUID *)ret = val; break; @@ -4701,6 +4714,58 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static HRESULT read_type_string( struct reader *reader, WS_TYPE_MAPPING mapping, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + const WS_STRING_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *ret, ULONG size ) +{ + WS_XML_UTF8_TEXT *utf8; + WS_STRING val = {0}; + HRESULT hr; + BOOL found; + + if (desc) FIXME( "ignoring description\n" ); + + if ((hr = read_get_text( reader, mapping, localname, ns, &utf8, &found )) != S_OK) return hr; + if (found && (hr = str_to_string( utf8->value.bytes, utf8->value.length, heap, &val )) != S_OK) + return hr; + + switch (option) + { + case WS_READ_REQUIRED_VALUE: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_NILLABLE_VALUE: + if (size != sizeof(val)) return E_INVALIDARG; + *(WS_STRING *)ret = val; + break; + + case WS_READ_REQUIRED_POINTER: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_OPTIONAL_POINTER: + case WS_READ_NILLABLE_POINTER: + { + WS_STRING *heap_val = NULL; + if (size != sizeof(heap_val)) return E_INVALIDARG; + if (found) + { + if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; + *heap_val = val; + } + *(WS_STRING **)ret = heap_val; + break; + } + default: + FIXME( "read option %u not supported\n", option ); + return E_NOTIMPL; + } + + return S_OK; +} + static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_BYTES_DESCRIPTION *desc, WS_READ_OPTION option, @@ -4724,7 +4789,7 @@ static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, /* fall through */ case WS_READ_NILLABLE_VALUE: - if (size != sizeof(WS_BYTES)) return E_INVALIDARG; + if (size != sizeof(val)) return E_INVALIDARG; *(WS_BYTES *)ret = val; break; @@ -5318,6 +5383,11 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return hr; break; + case WS_STRING_TYPE: + if ((hr = read_type_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) + return hr; + break; + case WS_WSZ_TYPE: if ((hr = read_type_wsz( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) return hr; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 466ba78..c5809db 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1372,7 +1372,7 @@ static void prepare_type_test( WS_XML_READER *reader, const char *data, ULONG si static void test_WsReadType(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR testW[] = {'t','e','s','t',0}, test2W[] = {' ','t','e','s','t',' '}; static const GUID guid1 = {0,0,0,{0,0,0,0,0,0,0,0}}; static const GUID guid2 = {0,0,0,{0,0,0,0,0,0,0,0xa1}}; static const char utf8[] = {'<','t','>',0xe2,0x80,0x99,'<','/','t','>'}; @@ -1398,6 +1398,7 @@ static void test_WsReadType(void) UINT64 val_uint64; GUID val_guid; WS_BYTES val_bytes; + WS_STRING val_string; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1696,6 +1697,14 @@ static void test_WsReadType(void) ok( val_str != NULL, "pointer not set\n" ); if (val_str) ok( !lstrcmpW( val_str, utf8W ), "wrong data %s\n", wine_dbgstr_w(val_str) ); + memset( &val_string, 0, sizeof(val_string) ); + prepare_type_test( reader, "<t> test </t>", sizeof("<t> test </t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRING_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_string, sizeof(val_string), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val_string.length == 6, "got %u\n", val_string.length ); + ok( !memcmp( val_string.chars, test2W, sizeof(test2W) ), "wrong data\n" ); + WsFreeReader( reader ); WsFreeHeap( heap ); }

1 0

Hans Leidekker : webservices: Add support for writing WS_UNIQUE_ID values.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 1746d162e748508624217bf661cb167affdcd6fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1746d162e748508624217bf66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:37 2017 +0200 webservices: Add support for writing WS_UNIQUE_ID values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 20 ++++++++++++++++++++ dlls/webservices/writer.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 03a9788..9cb6c7d 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -679,6 +679,7 @@ static void test_basic_type(void) WCHAR *str; WS_STRING string; WS_BYTES bytes; + WS_UNIQUE_ID id; ULONG i; static const struct { @@ -830,6 +831,25 @@ static void test_basic_type(void) check_output( writer, "<t a:nil=\"true\" xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/>", __LINE__ ); + prepare_basic_type_test( writer ); + memset( &id, 0, sizeof(id) ); + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, + &id, sizeof(id), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>urn:uuid:00000000-0000-0000-0000-000000000000</t>", __LINE__ ); + + prepare_basic_type_test( writer ); + id.uri.length = 4; + id.uri.chars = testW; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, + &id, sizeof(id), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>test</t>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 2f2cd5d..9272b59 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2615,6 +2615,40 @@ static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping, return write_type_text( writer, mapping, &utf8.text ); } +static HRESULT write_type_unique_id( struct writer *writer, WS_TYPE_MAPPING mapping, + 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" */ + const WS_UNIQUE_ID *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(*ptr), (const void **)&ptr )) != S_OK) return hr; + if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); + + 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 ); + } + + 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 ); +} + static HRESULT write_type_string( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_STRING_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) @@ -2740,6 +2774,7 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) case WS_DOUBLE_TYPE: case WS_DATETIME_TYPE: case WS_GUID_TYPE: + case WS_UNIQUE_ID_TYPE: case WS_STRING_TYPE: case WS_BYTES_TYPE: case WS_XML_STRING_TYPE: @@ -2956,6 +2991,9 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_GUID_TYPE: return write_type_guid( writer, mapping, desc, option, value, size ); + case WS_UNIQUE_ID_TYPE: + return write_type_unique_id( writer, mapping, desc, option, value, size ); + case WS_STRING_TYPE: return write_type_string( writer, mapping, desc, option, value, size );

1 0

Daniel Lehman : winedbg: Display movups in disassembly.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 068fc3f2fee16087c1ce953cc1ba8157ded7a1d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=068fc3f2fee16087c1ce953cc… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jun 20 19:13:17 2017 -0700 winedbg: Display movups in disassembly. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/db_disasm64.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 4957eeb..3db0b5e 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -270,6 +270,26 @@ static const struct inst db_inst_0f0x[] = { /*0f*/ { "", FALSE, NONE, 0, 0 }, }; +static const struct inst db_inst_0f1x[] = { +/*10*/ { "movups",TRUE, NONE, op2(E, XMM), 0 }, +/*11*/ { "movups",TRUE, NONE, op2(XMM, E), 0 }, +/*12*/ { "", FALSE, NONE, 0, 0 }, +/*13*/ { "", FALSE, NONE, 0, 0 }, +/*14*/ { "", FALSE, NONE, 0, 0 }, +/*15*/ { "", FALSE, NONE, 0, 0 }, +/*16*/ { "", FALSE, NONE, 0, 0 }, +/*17*/ { "", FALSE, NONE, 0, 0 }, + +/*18*/ { "", FALSE, NONE, 0, 0 }, +/*19*/ { "", FALSE, NONE, 0, 0 }, +/*1a*/ { "", FALSE, NONE, 0, 0 }, +/*1b*/ { "", FALSE, NONE, 0, 0 }, +/*1c*/ { "", FALSE, NONE, 0, 0 }, +/*1d*/ { "", FALSE, NONE, 0, 0 }, +/*1e*/ { "", FALSE, NONE, 0, 0 }, +/*1f*/ { "", FALSE, NONE, 0, 0 }, +}; + static const struct inst db_inst_0f2x[] = { /*20*/ { "mov", TRUE, LONG, op2(CR,El), 0 }, /*21*/ { "mov", TRUE, LONG, op2(DR,El), 0 }, @@ -491,7 +511,7 @@ static const struct inst db_inst_0fcx[] = { static const struct inst * const db_inst_0f[] = { db_inst_0f0x, - 0, + db_inst_0f1x, db_inst_0f2x, db_inst_0f3x, db_inst_0f4x,

1 0

Austin English : dbgeng: Sync to windows 10.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 444a7fbf56894d417674b5bb943cb0eb16e9f247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444a7fbf56894d417674b5bb9… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 20 20:03:04 2017 -0500 dbgeng: Sync to windows 10. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbgeng/dbgeng.spec b/dlls/dbgeng/dbgeng.spec index 1ad1099..f2f735c 100644 --- a/dlls/dbgeng/dbgeng.spec +++ b/dlls/dbgeng/dbgeng.spec @@ -1,3 +1,6 @@ -@ stdcall DebugExtensionInitialize(ptr ptr) -@ stdcall DebugCreate(ptr ptr) +327 stub @ @ stdcall DebugConnect(str ptr ptr) +@ stub DebugConnectWide +@ stdcall DebugCreate(ptr ptr) +@ stub DebugCreateEx +@ stdcall DebugExtensionInitialize(ptr ptr)

1 0

Zhenbo Li : ole32: Add stub for OleGetIconOfFile.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 13c6d37766b2d327583123be583c026b1ea0ec13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13c6d37766b2d327583123be5… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Jun 21 00:13:28 2017 -0600 ole32: Add stub for OleGetIconOfFile. Signed-off-by: Zhenbo Li <litimetal(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2stubs.c | 9 +++++++++ dlls/ole32/ole32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 90862d0..d7fd58c 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -63,6 +63,15 @@ HGLOBAL WINAPI OleGetIconOfClass(REFCLSID rclsid, LPOLESTR lpszLabel, BOOL fUseT } /*********************************************************************** + * OleGetIconOfFile [OLE32.@] + */ +HGLOBAL WINAPI OleGetIconOfFile(LPOLESTR path, BOOL use_file_as_label) +{ + FIXME("(%s, %d), stub!\n", debugstr_w(path), use_file_as_label); + return NULL; +} + +/*********************************************************************** * OleRegEnumFormatEtc [OLE32.@] */ HRESULT WINAPI DECLSPEC_HOTPATCH OleRegEnumFormatEtc ( diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 58bdd22..d5a71b3 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -207,7 +207,7 @@ @ stdcall OleGetAutoConvert(ptr ptr) @ stdcall OleGetClipboard(ptr) @ stdcall OleGetIconOfClass(ptr ptr long) -@ stub OleGetIconOfFile +@ stdcall OleGetIconOfFile(wstr long) @ stdcall OleInitialize(ptr) @ stdcall OleInitializeWOW(long long) @ stdcall OleIsCurrentClipboard(ptr)

1 0