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

Jacek Caban : wininet: Propagate WSAEWOULDBLOCK from read_http_stream.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: c140a7042567a359b044d8d7a9896583168bbb77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c140a7042567a359b044d8d7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:19:03 2017 +0100 wininet: Propagate WSAEWOULDBLOCK from read_http_stream. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fcd8d50..947c507 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2572,12 +2572,8 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD DWORD res; res = req->data_stream->vtbl->read(req->data_stream, req, buf, size, read, blocking_mode); - if(res != ERROR_SUCCESS) { - if(res != WSAEWOULDBLOCK) - return res; + if(res != ERROR_SUCCESS) *read = 0; - return ERROR_SUCCESS; - } assert(*read <= size); if(req->hCacheFile) { @@ -2590,7 +2586,7 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD FIXME("WriteFile failed: %u\n", GetLastError()); } - if(!*read || req->data_stream->vtbl->end_of_data(req->data_stream, req)) + if((res == ERROR_SUCCESS && !*read) || req->data_stream->vtbl->end_of_data(req->data_stream, req)) commit_cache_entry(req); } @@ -2613,6 +2609,9 @@ static DWORD refill_read_buffer(http_request_t *req, blocking_mode_t blocking_mo res = read_http_stream(req, req->read_buf+req->read_size, sizeof(req->read_buf) - req->read_size, &read, blocking_mode); + if(res != ERROR_SUCCESS) + return res; + req->read_size += read; TRACE("read %u bytes, read_size %u\n", read, req->read_size); @@ -3004,17 +3003,19 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD mode = first_notif && req->read_size ? BLOCKING_DISALLOW : BLOCKING_ALLOW; res = refill_read_buffer(req, mode, &read); - if(res == ERROR_SUCCESS) + if(res == ERROR_SUCCESS) { avail = get_avail_data(req); + read += req->read_size; + } LeaveCriticalSection( &req->read_section ); - if(res != ERROR_SUCCESS || (mode != BLOCKING_DISALLOW && !read)) { + if(res != WSAEWOULDBLOCK && (res != ERROR_SUCCESS || !read)) { WARN("res %u read %u, closing connection\n", res, read); http_release_netconn(req, FALSE); } - if(res != ERROR_SUCCESS) { + if(res != ERROR_SUCCESS && res != WSAEWOULDBLOCK) { send_request_complete(req, 0, res); return; } @@ -3046,7 +3047,10 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * if(ret_read < size) { res = read_http_stream(req, (BYTE*)buffer+ret_read, size-ret_read, &current_read, blocking_mode); - ret_read += current_read; + if(res == ERROR_SUCCESS) + ret_read += current_read; + else if(res == WSAEWOULDBLOCK && ret_read) + res = ERROR_SUCCESS; } LeaveCriticalSection( &req->read_section ); @@ -3054,7 +3058,7 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * *read = ret_read; TRACE( "retrieved %u bytes (%u)\n", ret_read, req->contentLength ); - if(size && !ret_read) + if(res != WSAEWOULDBLOCK && (!ret_read || res != ERROR_SUCCESS)) http_release_netconn(req, res == ERROR_SUCCESS); return res; @@ -3111,8 +3115,11 @@ static void AsyncReadFileExProc(task_header_t *hdr) if(task->ret_read) res = HTTPREQ_Read(req, task->buf, task->size, &read, BLOCKING_ALLOW); - if(res == ERROR_SUCCESS) + if(res == ERROR_SUCCESS) { res = refill_read_buffer(req, task->ret_read ? BLOCKING_DISALLOW : BLOCKING_ALLOW, &buffered); + if(res == WSAEWOULDBLOCK) + res = ERROR_SUCCESS; + } if (res == ERROR_SUCCESS) { if(task->ret_read)

1 0

Jacek Caban : wininet: Pass blocking mode to HTTPREQ_Read.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: f42a2ccad141cbbf9018f78bcfa474603a0f1288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42a2ccad141cbbf9018f78bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:18:21 2017 +0100 wininet: Pass blocking mode to HTTPREQ_Read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 26f7f87..fcd8d50 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3028,14 +3028,11 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD } /* read data from the http connection (the read section must be held) */ -static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read) +static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read, blocking_mode_t blocking_mode) { DWORD current_read = 0, ret_read = 0; - blocking_mode_t blocking_mode; DWORD res = ERROR_SUCCESS; - blocking_mode = req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC ? BLOCKING_ALLOW : BLOCKING_WAITALL; - EnterCriticalSection( &req->read_section ); if(req->read_size) { @@ -3082,7 +3079,7 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) DWORD bytes_read, res; BYTE buf[4096]; - res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read); + res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, BLOCKING_ALLOW); if(res != ERROR_SUCCESS) { ret = FALSE; break; @@ -3113,7 +3110,7 @@ static void AsyncReadFileExProc(task_header_t *hdr) TRACE("%p\n", req); if(task->ret_read) - res = HTTPREQ_Read(req, task->buf, task->size, &read); + res = HTTPREQ_Read(req, task->buf, task->size, &read, BLOCKING_ALLOW); if(res == ERROR_SUCCESS) res = refill_read_buffer(req, task->ret_read ? BLOCKING_DISALLOW : BLOCKING_ALLOW, &buffered); if (res == ERROR_SUCCESS) @@ -3150,7 +3147,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO { if (get_avail_data(req) || end_of_read_data(req)) { - res = HTTPREQ_Read(req, buf, size, &read); + res = HTTPREQ_Read(req, buf, size, &read, BLOCKING_DISALLOW); LeaveCriticalSection( &req->read_section ); goto done; } @@ -3176,7 +3173,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; while(1) { - res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread); + res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread, BLOCKING_ALLOW); if(res != ERROR_SUCCESS) break; @@ -3240,7 +3237,7 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW { if (get_avail_data(req) || end_of_read_data(req)) { - res = HTTPREQ_Read(req, buffer, size, read); + res = HTTPREQ_Read(req, buffer, size, read, BLOCKING_DISALLOW); LeaveCriticalSection( &req->read_section ); return res; } @@ -3262,7 +3259,7 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW if(hdr->dwError == INTERNET_HANDLE_IN_USE) hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - res = HTTPREQ_Read(req, buffer, size, read); + res = HTTPREQ_Read(req, buffer, size, read, BLOCKING_WAITALL); if(res == ERROR_SUCCESS) res = hdr->dwError; LeaveCriticalSection( &req->read_section );

1 0

Jacek Caban : wininet: Propagate WSAEWOULDBLOCK result from content decoding reads.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 67b56774c5303141948ada19e96d08cf01247a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b56774c5303141948ada19e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:18:10 2017 +0100 wininet: Propagate WSAEWOULDBLOCK result from content decoding reads. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 21b93dd..26f7f87 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -484,10 +484,8 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW break; if(!current_read) { - if(blocking_mode != BLOCKING_DISALLOW) { - WARN("unexpected end of data\n"); - gzip_stream->end_of_data = TRUE; - } + WARN("unexpected end of data\n"); + gzip_stream->end_of_data = TRUE; break; } } @@ -518,6 +516,8 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW } TRACE("read %u bytes\n", ret_read); + if(ret_read) + res = ERROR_SUCCESS; *read = ret_read; return res; } @@ -2572,6 +2572,12 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD DWORD res; res = req->data_stream->vtbl->read(req->data_stream, req, buf, size, read, blocking_mode); + if(res != ERROR_SUCCESS) { + if(res != WSAEWOULDBLOCK) + return res; + *read = 0; + return ERROR_SUCCESS; + } assert(*read <= size); if(req->hCacheFile) { @@ -2584,7 +2590,7 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD FIXME("WriteFile failed: %u\n", GetLastError()); } - if(req->data_stream->vtbl->end_of_data(req->data_stream, req)) + if(!*read || req->data_stream->vtbl->end_of_data(req->data_stream, req)) commit_cache_entry(req); } @@ -2669,7 +2675,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, break; } - if(ret || (blocking_mode == BLOCKING_DISALLOW && res == WSAEWOULDBLOCK)) + if(res == WSAEWOULDBLOCK && ret) res = ERROR_SUCCESS; } @@ -2750,6 +2756,8 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(res == ERROR_SUCCESS && read_bytes) { chunked_stream->buf_size += read_bytes; }else if(res == WSAEWOULDBLOCK) { + if(ret_read) + res = ERROR_SUCCESS; continue_read = FALSE; continue; }else { @@ -2853,7 +2861,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(ret_read) res = ERROR_SUCCESS; - if(res != ERROR_SUCCESS && res != WSAEWOULDBLOCK) + if(res != ERROR_SUCCESS) return res; TRACE("read %d bytes\n", ret_read);

1 0

Nikolay Sivov : xmllite/reader: Fix position methods return values in closed reader state.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 79a65678fc158a56e789946e3ce6ebbf6bda0d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a65678fc158a56e789946e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:42 2017 +0300 xmllite/reader: Fix position methods return values in closed reader state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 ++-- dlls/xmllite/tests/reader.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c9ab4e1..c5aa99b 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3320,7 +3320,7 @@ static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *line_numb break; } - return S_OK; + return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_position) @@ -3355,7 +3355,7 @@ static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_po break; } - return S_OK; + return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index a44af67..f7987c7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2484,6 +2484,8 @@ static void test_reader_position(void) hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); + TEST_READER_STATE(reader, XmlReadState_Closed); + /* position methods with Null args */ hr = IXmlReader_GetLineNumber(reader, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); @@ -2493,13 +2495,11 @@ static void test_reader_position(void) position = 123; hr = IXmlReader_GetLinePosition(reader, &position); -todo_wine ok(hr == S_FALSE, "got %#x\n", hr); ok(position == 0, "got %u\n", position); position = 123; hr = IXmlReader_GetLineNumber(reader, &position); -todo_wine ok(hr == S_FALSE, "got %#x\n", hr); ok(position == 0, "got %u\n", position); @@ -2508,6 +2508,7 @@ todo_wine hr = IXmlReader_SetInput(reader, (IUnknown *)stream); ok(hr == S_OK, "got %08x\n", hr); + TEST_READER_STATE(reader, XmlReadState_Initial); TEST_READER_POSITION(reader, 0, 0); hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); @@ -2532,6 +2533,7 @@ todo_wine TEST_READER_POSITION2(reader, 1, 37, ~0u, 40); IXmlReader_SetInput(reader, NULL); + TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed); TEST_READER_POSITION(reader, 0, 0); IStream_Release(stream);

1 0

Nikolay Sivov : xmllite/reader: Return correct error for multiple colons in qualified name.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 62a41d035c0a61d5565ab0a17d96aa0195e24adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a41d035c0a61d5565ab0a17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:41 2017 +0300 xmllite/reader: Return correct error for multiple colons in qualified name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 9 ++++++--- dlls/xmllite/tests/reader.c | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 056721e..c9ab4e1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1838,7 +1838,7 @@ static HRESULT reader_parse_dtd(xmlreader *reader) } /* [11 NS] LocalPart ::= NCName */ -static HRESULT reader_parse_local(xmlreader *reader, strval *local) +static HRESULT reader_parse_local(xmlreader *reader, strval *local, BOOL check_for_separator) { WCHAR *ptr; UINT start; @@ -1860,6 +1860,9 @@ static HRESULT reader_parse_local(xmlreader *reader, strval *local) ptr = reader_get_ptr(reader); } + if (check_for_separator && *ptr == ':') + return NC_E_QNAMECOLON; + if (is_reader_pending(reader)) { reader->resume[XmlReadResume_Local] = start; @@ -1898,7 +1901,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc if (reader->resume[XmlReadResume_Local]) { - hr = reader_parse_local(reader, local); + hr = reader_parse_local(reader, local, FALSE); if (FAILED(hr)) return hr; reader_init_strvalue(reader->resume[XmlReadResume_Name], @@ -1923,7 +1926,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc /* skip ':' */ reader_skipn(reader, 1); - hr = reader_parse_local(reader, local); + hr = reader_parse_local(reader, local, TRUE); if (FAILED(hr)) return hr; } else diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 4318a29..a44af67 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1415,6 +1415,8 @@ static struct test_entry element_tests[] = { { "<a >", "a", "", S_OK }, { "<a \r \t\n>", "a", "", S_OK }, { "</a>", NULL, NULL, NC_E_QNAMECHARACTER }, + { "<a:b:c />", NULL, NULL, NC_E_QNAMECOLON }, + { "<:b:c />", NULL, NULL, NC_E_QNAMECHARACTER }, { NULL } };

1 0

Jacek Caban : wininet: Get rid of no longer needed BLOCKING_WAITALL.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 18f9d0303a8f24da6e173a5f587ebfcf0d1a0359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18f9d0303a8f24da6e173a5f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:20:20 2017 +0100 wininet: Get rid of no longer needed BLOCKING_WAITALL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9cb517d..501a4a5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -382,8 +382,7 @@ static WCHAR *get_host_header( http_request_t *req ) typedef enum { BLOCKING_ALLOW, - BLOCKING_DISALLOW, - BLOCKING_WAITALL + BLOCKING_DISALLOW } blocking_mode_t; struct data_stream_vtbl_t { @@ -2658,27 +2657,20 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; DWORD res = ERROR_SUCCESS; - int len = 0, ret = 0; + int ret = 0; size = min(size, netconn_stream->content_length-netconn_stream->content_read); if(size && is_valid_netconn(req->netconn)) { - while((res = NETCON_recv(req->netconn, buf+ret, size-ret, blocking_mode != BLOCKING_DISALLOW, &len)) == ERROR_SUCCESS) { - if(!len) { + res = NETCON_recv(req->netconn, buf, size, blocking_mode != BLOCKING_DISALLOW, &ret); + if(res == ERROR_SUCCESS) { + if(!ret) netconn_stream->content_length = netconn_stream->content_read; - break; - } - ret += len; - netconn_stream->content_read += len; - if(blocking_mode != BLOCKING_WAITALL || size == ret) - break; + netconn_stream->content_read += ret; } - - if(res == WSAEWOULDBLOCK && ret) - res = ERROR_SUCCESS; } - TRACE("read %u bytes\n", ret); + TRACE("res %u read %u bytes\n", res, ret); *read = ret; return res; }

1 0

Nikolay Sivov : xmllite/reader: Return static empty string as xml declaration node value.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 1ccc1f2f26eddba37438a88e18cd41fa931e6b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccc1f2f26eddba37438a88e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:38 2017 +0300 xmllite/reader: Return static empty string as xml declaration node value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 67 ++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 28da5e1..1805758 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1328,7 +1328,6 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) reader->empty_element.position = position; reader_set_strvalue(reader, StringValue_LocalName, &strval_xml); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_xml); - reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; } @@ -3171,26 +3170,17 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, const WCHAR **ret, return S_OK; } -static BOOL is_namespace_definition(xmlreader *reader) -{ - const strval *local = &reader->strvalues[StringValue_LocalName]; - const strval *prefix = &reader->strvalues[StringValue_Prefix]; - - if (reader_get_nodetype(reader) != XmlNodeType_Attribute) - return FALSE; - - return ((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || - strval_eq(reader, prefix, &strval_xmlns)); -} - static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) { xmlreader *reader = impl_from_IXmlReader(iface); strval *val = &reader->strvalues[StringValue_Value]; + UINT length; TRACE("(%p)->(%p %p)\n", reader, value, len); *value = NULL; + if (!len) + len = &length; if ((reader->nodetype == XmlNodeType_Comment && !val->str && !val->len) || is_reader_pending(reader)) { @@ -3204,29 +3194,46 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, if (is_reader_pending(reader)) return E_PENDING; } - if (!val->str) + switch (reader_get_nodetype(reader)) { - WCHAR *ptr = reader_alloc(reader, (val->len+1)*sizeof(WCHAR)); - if (!ptr) return E_OUTOFMEMORY; - memcpy(ptr, reader_get_strptr(reader, val), val->len*sizeof(WCHAR)); - ptr[val->len] = 0; - val->str = ptr; - } + case XmlNodeType_XmlDeclaration: + *value = emptyW; + *len = 0; + break; + case XmlNodeType_Attribute: + { + const strval *local = &reader->strvalues[StringValue_LocalName]; + const strval *prefix = &reader->strvalues[StringValue_Prefix]; - /* For namespace definition attributes return values from namespace list */ - if (is_namespace_definition(reader)) { - const strval *local = &reader->strvalues[StringValue_LocalName]; - struct ns *ns; + /* For namespace definition attributes return values from namespace list */ + if (((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || + strval_eq(reader, prefix, &strval_xmlns))) + { + struct ns *ns; - ns = reader_lookup_ns(reader, local); - if (!ns) - ns = reader_lookup_nsdef(reader); + if (!(ns = reader_lookup_ns(reader, local))) + ns = reader_lookup_nsdef(reader); - val = &ns->uri; + *value = ns->uri.str; + *len = ns->uri.len; + break; + } + } + /* fallthrough */ + default: + if (!val->str) + { + WCHAR *ptr = reader_alloc(reader, (val->len+1)*sizeof(WCHAR)); + if (!ptr) return E_OUTOFMEMORY; + memcpy(ptr, reader_get_strptr(reader, val), val->len*sizeof(WCHAR)); + ptr[val->len] = 0; + val->str = ptr; + } + *value = val->str; + *len = val->len; + break; } - *value = val->str; - if (len) *len = val->len; return S_OK; }

1 0

Nikolay Sivov : xmllite/reader: Explicitly return empty static string as local name for nodes without names.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 52f91932acd26ababbb6fad9434107cafccc2ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f91932acd26ababbb6fad94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:39 2017 +0300 xmllite/reader: Explicitly return empty static string as local name for nodes without names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 15 ++++++++------- dlls/xmllite/tests/reader.c | 22 +++++++--------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1805758..1dba23c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1353,7 +1353,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_Comment; - reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -1376,7 +1375,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) /* skip rest of markup '->' */ reader_skipn(reader, 3); - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; @@ -2343,7 +2341,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader->nodetype = XmlNodeType_CDATA; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CDATA; - reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -2360,7 +2357,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader_skipn(reader, 3); TRACE("%s\n", debug_strval(reader, &value)); - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; @@ -2404,7 +2400,6 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader->nodetype = is_wchar_space(*ptr) ? XmlNodeType_Whitespace : XmlNodeType_Text; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CharData; - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -3090,7 +3085,6 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); - XmlNodeType nodetype; UINT length; TRACE("(%p)->(%p %p)\n", This, name, len); @@ -3098,8 +3092,15 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U if (!len) len = &length; - switch ((nodetype = reader_get_nodetype(This))) + switch (reader_get_nodetype(This)) { + case XmlNodeType_Text: + case XmlNodeType_CDATA: + case XmlNodeType_Comment: + case XmlNodeType_Whitespace: + *name = emptyW; + *len = 0; + break; case XmlNodeType_Element: case XmlNodeType_EndElement: /* empty elements are not added to the stack */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 208e4be..31b5ce8 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1010,19 +1010,15 @@ static void test_read_comment(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ len = 1; @@ -1696,21 +1692,17 @@ static void test_read_cdata(void) ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); - str_exp = a2w(test->name); - len = 1; str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - - free_str(str_exp); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); len = 1; str = NULL;

1 0

Nikolay Sivov : xmllite/reader: Explicitly return empty string as qualified name for some node types.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 3b83a44639788c6f9b6821d7186d543507a70397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b83a44639788c6f9b6821d71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:40 2017 +0300 xmllite/reader: Explicitly return empty string as qualified name for some node types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 15 ++++++++------- dlls/xmllite/tests/reader.c | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1dba23c..056721e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1353,7 +1353,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_Comment; - reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -1375,7 +1374,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) /* skip rest of markup '->' */ reader_skipn(reader, 3); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; @@ -2341,7 +2339,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader->nodetype = XmlNodeType_CDATA; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CDATA; - reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -2357,7 +2354,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader_skipn(reader, 3); TRACE("%s\n", debug_strval(reader, &value)); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; @@ -2400,7 +2396,6 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader->nodetype = is_wchar_space(*ptr) ? XmlNodeType_Whitespace : XmlNodeType_Text; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CharData; - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -2942,7 +2937,6 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); - XmlNodeType nodetype; UINT length; TRACE("(%p)->(%p %p)\n", This, name, len); @@ -2950,8 +2944,15 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam if (!len) len = &length; - switch ((nodetype = reader_get_nodetype(This))) + switch (reader_get_nodetype(This)) { + case XmlNodeType_Text: + case XmlNodeType_CDATA: + case XmlNodeType_Comment: + case XmlNodeType_Whitespace: + *name = emptyW; + *len = 0; + break; case XmlNodeType_Element: case XmlNodeType_EndElement: /* empty elements are not added to the stack */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 31b5ce8..4318a29 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1013,6 +1013,11 @@ static void test_read_comment(void) ok(len == 0, "got %u\n", len); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); @@ -1020,6 +1025,11 @@ static void test_read_comment(void) ok(len == 0, "got %u\n", len); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + /* value */ len = 1; str = NULL; @@ -1708,10 +1718,13 @@ static void test_read_cdata(void) str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ len = 1; @@ -1779,30 +1792,29 @@ static void test_read_text(void) ok(type == XmlNodeType_Text, "got %d for %s\n", type, test->xml); - str_exp = a2w(test->name); - len = 1; str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - - free_str(str_exp); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ len = 1;

1 0

Nikolay Sivov : xmllite/reader: Improve returned position for whitespace text nodes.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: b115e9675feed5dddb7d0ca2eba71ee837683ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b115e9675feed5dddb7d0ca2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:44 2017 +0300 xmllite/reader: Improve returned position for whitespace text nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 5 +++++ dlls/xmllite/tests/reader.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b223994..b5088e8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2383,6 +2383,7 @@ static HRESULT reader_parse_cdata(xmlreader *reader) /* [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*) */ static HRESULT reader_parse_chardata(xmlreader *reader) { + struct reader_position position; WCHAR *ptr; UINT start; @@ -2404,6 +2405,7 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader_set_strvalue(reader, StringValue_Value, NULL); } + position = reader->position; while (*ptr) { static const WCHAR ampW[] = {'&',0}; @@ -2417,6 +2419,7 @@ static HRESULT reader_parse_chardata(xmlreader *reader) { strval value; + reader->empty_element.position = position; reader_init_strvalue(start, reader_get_cur(reader)-start, &value); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; @@ -3314,6 +3317,7 @@ static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *line_numb case XmlNodeType_Attribute: *line_number = This->attr->position.line_number; break; + case XmlNodeType_Whitespace: case XmlNodeType_XmlDeclaration: *line_number = This->empty_element.position.line_number; break; @@ -3349,6 +3353,7 @@ static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_po case XmlNodeType_Attribute: *line_position = This->attr->position.line_position; break; + case XmlNodeType_Whitespace: case XmlNodeType_XmlDeclaration: *line_position = This->empty_element.position.line_position; break; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index fdd2750..e66b9e4 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2531,7 +2531,6 @@ static void test_reader_position(void) hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Whitespace, "got type %d\n", type); -todo_wine TEST_READER_POSITION2(reader, 1, 35, 2, 6); hr = IXmlReader_Read(reader, &type);

1 0