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

Nikolay Sivov : scrrun/tests: Skip some tests if drive is not ready.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 888f2c76dd7bccb408bbfcf16326a95ba54e585b URL: http://source.winehq.org/git/wine.git/?a=commit;h=888f2c76dd7bccb408bbfcf16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 22 20:16:52 2017 +0300 scrrun/tests: Skip some tests if drive is not ready. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 57aacf6..bb926c2 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1397,6 +1397,17 @@ static void test_DriveCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(ready == VARIANT_TRUE, "got %x\n", ready); + if (ready != VARIANT_TRUE) { + hr = IDrive_get_DriveLetter(drive, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + + skip("Drive %s is not ready, skipping some tests\n", wine_dbgstr_w(str)); + + VariantClear(&var); + SysFreeString(str); + continue; + } + V_VT(&size) = VT_EMPTY; hr = IDrive_get_TotalSize(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Jacek Caban : xmllite: Return empty value for end element and none nodes.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 536ed3f3fb344fbc7ba6ce3faf4b5666c47d8a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536ed3f3fb344fbc7ba6ce3fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 21 17:16:19 2017 +0100 xmllite: Return empty value for end element and none nodes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 4350764..de24537 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3290,6 +3290,8 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, switch (reader_get_nodetype(reader)) { case XmlNodeType_XmlDeclaration: + case XmlNodeType_EndElement: + case XmlNodeType_None: *value = emptyW; *len = 0; break;

1 0

Jacek Caban : xmllite/tests: Added more value tests.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 40a241469eac20f575f59b6b2a4472f10a696e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a241469eac20f575f59b6b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 21 16:19:49 2017 +0100 xmllite/tests: Added more value tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 71 +++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c9ae1db..56487d7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1140,7 +1140,10 @@ static void test_read_pi(void) struct nodes_test { const char *xml; - XmlNodeType types[20]; + struct { + XmlNodeType type; + const char *value; + } nodes[20]; }; static const char misc_test_xml[] = @@ -1164,22 +1167,22 @@ static const char misc_test_xml[] = static struct nodes_test misc_test = { misc_test_xml, { - XmlNodeType_Comment, - XmlNodeType_Comment, - XmlNodeType_ProcessingInstruction, - XmlNodeType_Comment, - XmlNodeType_Whitespace, - XmlNodeType_Comment, - XmlNodeType_Element, - XmlNodeType_Whitespace, - XmlNodeType_Element, - XmlNodeType_Text, - XmlNodeType_Comment, - XmlNodeType_Text, - XmlNodeType_ProcessingInstruction, - XmlNodeType_Whitespace, - XmlNodeType_EndElement, - XmlNodeType_None + {XmlNodeType_Comment, " comment1 "}, + {XmlNodeType_Comment, " comment2 "}, + {XmlNodeType_ProcessingInstruction, "pi1body "}, + {XmlNodeType_Comment, " comment3 "}, + {XmlNodeType_Whitespace, " \t \n \n"}, + {XmlNodeType_Comment, " comment4 "}, + {XmlNodeType_Element, ""}, + {XmlNodeType_Whitespace, "\n\t"}, + {XmlNodeType_Element, ""}, + {XmlNodeType_Text, "text"}, + {XmlNodeType_Comment, " comment "}, + {XmlNodeType_Text, "text2"}, + {XmlNodeType_ProcessingInstruction, "pibody "}, + {XmlNodeType_Whitespace, "\n"}, + {XmlNodeType_EndElement, ""}, + {XmlNodeType_None, ""} } }; @@ -1187,37 +1190,41 @@ static void test_read_full(void) { struct nodes_test *test = &misc_test; IXmlReader *reader; + const WCHAR *value; XmlNodeType type; IStream *stream; + ULONG len; HRESULT hr; int i; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + stream = create_stream_on_data(test->xml, strlen(test->xml)); hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); i = 0; type = ~0u; - while (IXmlReader_Read(reader, &type) == S_OK) + do { - ok(test->types[i] != XmlNodeType_None, "%d: unexpected end of test data\n", i); - if (test->types[i] == XmlNodeType_None) break; - ok(type == test->types[i], "%d: got wrong type %d, expected %d\n", i, type, test->types[i]); - if (type == XmlNodeType_Whitespace) - { - const WCHAR *ptr; - UINT len = 0; + hr = IXmlReader_Read(reader, &type); + if (test->nodes[i].type != XmlNodeType_None) + ok(hr == S_OK, "Read returned %08x\n", hr); + else + ok(hr == S_FALSE, "Read returned %08x\n", hr); + + ok(type == test->nodes[i].type, "%d: got wrong type %d, expected %d\n", i, type, test->nodes[i].type); - hr = IXmlReader_GetValue(reader, &ptr, &len); - ok(hr == S_OK, "%d: GetValue failed 0x%08x\n", i, hr); - ok(len > 0, "%d: wrong value length %d\n", i, len); + len = 0xdeadbeef; + hr = IXmlReader_GetValue(reader, &value, &len); + ok(hr == S_OK, "GetValue failed: %08x\n", hr); + if (test->nodes[i].value) + { + ok(!strcmp_wa(value, test->nodes[i].value), "value = %s\n", wine_dbgstr_w(value)); + ok(len == strlen(test->nodes[i].value), "len = %u\n", len); } - i++; - } - ok(test->types[i] == XmlNodeType_None, "incomplete sequence, got %d\n", test->types[i]); + } while(test->nodes[i++].type != XmlNodeType_None); IStream_Release(stream); IXmlReader_Release(reader);

1 0

Hugh McMaster : regedit: Return success or failure from import functions.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 5052a759b3961755c3b30892380d9e62ef199b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5052a759b3961755c3b308923… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 22 11:54:16 2017 +0000 regedit: Return success or failure from import functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 06a69a4..24c1e35 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -745,7 +745,7 @@ static char *get_lineA(FILE *fp) return NULL; } -static void processRegLinesA(FILE *fp, char *two_chars) +static BOOL processRegLinesA(FILE *fp, char *two_chars) { char *line, *header; WCHAR *lineW; @@ -766,7 +766,7 @@ static void processRegLinesA(FILE *fp, char *two_chars) if (reg_version == REG_VERSION_INVALID) { get_lineA(NULL); /* Reset static variables */ - return; + return FALSE; } while ((line = get_lineA(fp))) @@ -782,6 +782,7 @@ static void processRegLinesA(FILE *fp, char *two_chars) } closeKey(); + return TRUE; } static WCHAR *get_lineW(FILE *fp) @@ -855,7 +856,7 @@ static WCHAR *get_lineW(FILE *fp) return NULL; } -static void processRegLinesW(FILE *fp) +static BOOL processRegLinesW(FILE *fp) { WCHAR *line; int reg_version; @@ -865,13 +866,14 @@ static void processRegLinesW(FILE *fp) if (reg_version == REG_VERSION_INVALID) { get_lineW(NULL); /* Reset static variables */ - return; + return FALSE; } while ((line = get_lineW(fp))) processRegEntry(line, TRUE); closeKey(); + return TRUE; } /****************************************************************************** @@ -1347,22 +1349,15 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) */ BOOL import_registry_file(FILE* reg_file) { - if (reg_file) - { - BYTE s[2]; - if (fread( s, 2, 1, reg_file) == 1) - { - if (s[0] == 0xff && s[1] == 0xfe) - { - processRegLinesW(reg_file); - } else - { - processRegLinesA(reg_file, (char*)s); - } - } - return TRUE; - } - return FALSE; + BYTE s[2]; + + if (!reg_file || (fread(s, 2, 1, reg_file) != 1)) + return FALSE; + + if (s[0] == 0xff && s[1] == 0xfe) + return processRegLinesW(reg_file); + else + return processRegLinesA(reg_file, (char *)s); } /******************************************************************************

1 0

Akihiro Sagawa : kernel32: Add localized version resource.
by Alexandre Julliard March 22, 2017

March 22, 2017

1 0

Jacek Caban : xmllite: Replace crln in input buffer with nl.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 48fff1b93110963a5e9ca61e0bca90ff8d39db82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48fff1b93110963a5e9ca61e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 21 16:19:32 2017 +0100 xmllite: Replace crln in input buffer with nl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 103 ++++++++++++++++++++++++-------------------- dlls/xmllite/tests/reader.c | 8 ++-- 2 files changed, 60 insertions(+), 51 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 478830d..4350764 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -178,6 +178,7 @@ typedef struct UINT cur; unsigned int allocated; unsigned int written; + BOOL prev_cr; } encoded_buffer; typedef struct input_buffer input_buffer; @@ -687,6 +688,7 @@ static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer buffer->cur = 0; buffer->allocated = initial_len; buffer->written = 0; + buffer->prev_cr = FALSE; return S_OK; } @@ -952,6 +954,34 @@ static void readerinput_shrinkraw(xmlreaderinput *readerinput, int len) buffer->cur = 0; } +static void fixup_buffer_cr(encoded_buffer *buffer, int off) +{ + BOOL prev_cr = buffer->prev_cr; + const WCHAR *src; + WCHAR *dest; + + src = dest = (WCHAR*)buffer->data + off; + while ((const char*)src < buffer->data + buffer->written) + { + if (*src == '\r') + { + *dest++ = '\n'; + src++; + prev_cr = TRUE; + continue; + } + if(prev_cr && *src == '\n') + src++; + else + *dest++ = *src++; + prev_cr = FALSE; + } + + buffer->written = (char*)dest - buffer->data; + buffer->prev_cr = prev_cr; + *dest = 0; +} + /* note that raw buffer content is kept */ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding enc) { @@ -976,15 +1006,18 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding readerinput_grow(readerinput, len); memcpy(dest->data, src->data + src->cur, len); dest->written += len*sizeof(WCHAR); - return; + } + else + { + dest_len = MultiByteToWideChar(cp, 0, src->data + src->cur, len, NULL, 0); + readerinput_grow(readerinput, dest_len); + ptr = (WCHAR*)dest->data; + MultiByteToWideChar(cp, 0, src->data + src->cur, len, ptr, dest_len); + ptr[dest_len] = 0; + dest->written += dest_len*sizeof(WCHAR); } - dest_len = MultiByteToWideChar(cp, 0, src->data + src->cur, len, NULL, 0); - readerinput_grow(readerinput, dest_len); - ptr = (WCHAR*)dest->data; - MultiByteToWideChar(cp, 0, src->data + src->cur, len, ptr, dest_len); - ptr[dest_len] = 0; - dest->written += dest_len*sizeof(WCHAR); + fixup_buffer_cr(dest, 0); } /* shrinks parsed data a buffer begins with */ @@ -1010,13 +1043,14 @@ static HRESULT reader_more(xmlreader *reader) encoded_buffer *src = &readerinput->buffer->encoded; encoded_buffer *dest = &readerinput->buffer->utf16; UINT cp = readerinput->buffer->code_page; - int len, dest_len; + int len, dest_len, prev_len; HRESULT hr; WCHAR *ptr; /* get some raw data from stream first */ hr = readerinput_growraw(readerinput); len = readerinput_get_convlen(readerinput); + prev_len = dest->written / sizeof(WCHAR); /* just copy for UTF-16 case */ if (cp == ~0) @@ -1024,18 +1058,20 @@ static HRESULT reader_more(xmlreader *reader) readerinput_grow(readerinput, len); memcpy(dest->data + dest->written, src->data + src->cur, len); dest->written += len*sizeof(WCHAR); - return hr; + } + else + { + dest_len = MultiByteToWideChar(cp, 0, src->data + src->cur, len, NULL, 0); + readerinput_grow(readerinput, dest_len); + ptr = (WCHAR*)(dest->data + dest->written); + MultiByteToWideChar(cp, 0, src->data + src->cur, len, ptr, dest_len); + ptr[dest_len] = 0; + dest->written += dest_len*sizeof(WCHAR); + /* get rid of processed data */ + readerinput_shrinkraw(readerinput, len); } - dest_len = MultiByteToWideChar(cp, 0, src->data + src->cur, len, NULL, 0); - readerinput_grow(readerinput, dest_len); - ptr = (WCHAR*)(dest->data + dest->written); - MultiByteToWideChar(cp, 0, src->data + src->cur, len, ptr, dest_len); - ptr[dest_len] = 0; - dest->written += dest_len*sizeof(WCHAR); - /* get rid of processed data */ - readerinput_shrinkraw(readerinput, len); - + fixup_buffer_cr(dest, prev_len); return hr; } @@ -1974,28 +2010,6 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc return S_OK; } -/* Applies normalization rules to a single char, used for attribute values. - - Rules include 2 steps: - - 1) replacing \r\n with a single \n; - 2) replacing all whitespace chars with ' '. - - */ -static void reader_normalize_space(xmlreader *reader, WCHAR *ptr) -{ - encoded_buffer *buffer = &reader->input->buffer->utf16; - - if (!is_wchar_space(*ptr)) return; - - if (*ptr == '\r' && *(ptr+1) == '\n') - { - int len = buffer->written - ((char*)ptr - buffer->data) - 2*sizeof(WCHAR); - memmove(ptr+1, ptr+2, len); - } - *ptr = ' '; -} - static WCHAR get_predefined_entity(const xmlreader *reader, const strval *name) { static const WCHAR entltW[] = {'l','t'}; @@ -2171,7 +2185,8 @@ static HRESULT reader_parse_attvalue(xmlreader *reader, strval *value) } else { - reader_normalize_space(reader, ptr); + /* replace all whitespace chars with ' ' */ + if (is_wchar_space(*ptr)) *ptr = ' '; reader_skipn(reader, 1); } ptr = reader_get_ptr(reader); @@ -2393,12 +2408,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) } else { - /* Value normalization is not fully implemented, rules are: - - - single '\r' -> '\n'; - - sequence '\r\n' -> '\n', in this case value length changes; - */ - if (*ptr == '\r') *ptr = '\n'; reader_skipn(reader, 1); ptr++; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index e91383f..c9ae1db 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1761,8 +1761,8 @@ static void test_readvaluechunk(void) static struct test_entry cdata_tests[] = { { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, - { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK, TRUE }, - { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK, TRUE }, + { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK }, + { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK }, { "<a><![CDATA[\r\r \n\r \r \n\n ]]></a>", "", "\n\n \n\n \n \n\n ", S_OK }, { NULL } }; @@ -1856,8 +1856,8 @@ static void test_read_cdata(void) static struct test_entry text_tests[] = { { "<a>simple text</a>", "", "simple text", S_OK }, { "<a>text ]]> text</a>", "", "", WC_E_CDSECTEND }, - { "<a>\n \r\n \n\n text</a>", "", "\n \n \n\n text", S_OK, S_OK, TRUE }, - { "<a>\r \r\r\n \n\n text</a>", "", "\n \n\n \n\n text", S_OK, S_OK, TRUE }, + { "<a>\n \r\n \n\n text</a>", "", "\n \n \n\n text", S_OK, S_OK }, + { "<a>\r \r\r\n \n\n text</a>", "", "\n \n\n \n\n text", S_OK, S_OK }, { NULL } };

1 0

Jacek Caban : xmllite: Fixed ReadValueChunk implementation.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 2b5203bdcdc8be9d07f645a038926bff8c34dcf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5203bdcdc8be9d07f645a03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 21 16:19:24 2017 +0100 xmllite: Fixed ReadValueChunk implementation. Mostly copy all characters to output buffer, but also minor fixes to returned values found by tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 11 ++++--- dlls/xmllite/tests/reader.c | 72 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 74 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c33d9bf..478830d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3328,18 +3328,17 @@ static HRESULT WINAPI xmlreader_ReadValueChunk(IXmlReader* iface, WCHAR *buffer, TRACE("(%p)->(%p %u %p)\n", reader, buffer, chunk_size, read); /* Value is already allocated, chunked reads are not possible. */ - if (val->str) return S_FALSE; + len = !val->str && val->len ? min(chunk_size, val->len) : 0; + if (read) *read = len; - if (val->len) + if (len) { - len = min(chunk_size, val->len); - memcpy(buffer, reader_get_ptr2(reader, val->start), len); + memcpy(buffer, reader_get_ptr2(reader, val->start), len*sizeof(WCHAR)); val->start += len; val->len -= len; - if (read) *read = len; } - return S_OK; + return len || !chunk_size ? S_OK : S_FALSE; } static HRESULT WINAPI xmlreader_GetBaseUri(IXmlReader* iface, diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 47192f9..e91383f 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -46,6 +46,14 @@ static void free_str(WCHAR *str) HeapFree(GetProcessHeap(), 0, str); } +static int strcmp_wa(const WCHAR *str1, const char *stra) +{ + WCHAR *str2 = a2w(stra); + int r = lstrcmpW(str1, str2); + free_str(str2); + return r; +} + static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; static const char xmldecl_short[] = "<?xml version=\"1.0\"?><RegistrationInfo/>"; @@ -1643,11 +1651,12 @@ todo_wine static void test_readvaluechunk(void) { - static const char testA[] = ""; + static const char testA[] = ""; IXmlReader *reader; XmlNodeType type; IStream *stream; const WCHAR *value; + WCHAR buf[64]; WCHAR b; HRESULT hr; UINT c; @@ -1661,6 +1670,7 @@ static void test_readvaluechunk(void) hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Comment, "type = %u\n", type); c = 0; b = 0; @@ -1669,11 +1679,18 @@ static void test_readvaluechunk(void) ok(c == 1, "got %u\n", c); ok(b == ' ', "got %x\n", b); + c = 0; + b = 0xffff; + hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); + ok(hr == S_OK, "got %08x\n", hr); + ok(c == 1, "got %u\n", c); + ok(b == 'c', "got %x\n", b); + /* portion read as chunk is skipped from resulting node value */ value = NULL; hr = IXmlReader_GetValue(reader, &value, NULL); ok(hr == S_OK, "got %08x\n", hr); - ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); + ok(!strcmp_wa(value, "omment1 "), "got %s\n", wine_dbgstr_w(value)); /* once value is returned/allocated it's not possible to read by chunk */ c = 0; @@ -1683,10 +1700,59 @@ static void test_readvaluechunk(void) ok(c == 0, "got %u\n", c); ok(b == 0, "got %x\n", b); + c = 0xdeadbeef; + hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c); + ok(hr == S_OK, "got %08x\n", hr); + ok(!c, "c = %u\n", c); + + value = NULL; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(!strcmp_wa(value, "omment1 "), "got %s\n", wine_dbgstr_w(value)); + + /* read comment2 */ + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Comment, "type = %u\n", type); + + c = 0xdeadbeef; + hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c); + ok(hr == S_OK, "got %08x\n", hr); + ok(!c, "c = %u\n", c); + + c = 0xdeadbeef; + memset(buf, 0xcc, sizeof(buf)); + hr = IXmlReader_ReadValueChunk(reader, buf, sizeof(buf)/sizeof(WCHAR), &c); + ok(hr == S_OK, "got %08x\n", hr); + ok(c == 10, "got %u\n", c); + ok(buf[c] == 0xcccc, "buffer overflow\n"); + buf[c] = 0; + ok(!strcmp_wa(buf, " comment2 "), "buf = %s\n", wine_dbgstr_w(buf)); + + c = 0xdeadbeef; + memset(buf, 0xcc, sizeof(buf)); + hr = IXmlReader_ReadValueChunk(reader, buf, sizeof(buf)/sizeof(WCHAR), &c); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(!c, "got %u\n", c); + + /* portion read as chunk is skipped from resulting node value */ + value = NULL; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(!*value, "got %s\n", wine_dbgstr_w(value)); + + /* once value is returned/allocated it's not possible to read by chunk */ + c = 0xdeadbeef; + b = 0xffff; + hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(c == 0, "got %u\n", c); + ok(b == 0xffff, "got %x\n", b); + value = NULL; hr = IXmlReader_GetValue(reader, &value, NULL); ok(hr == S_OK, "got %08x\n", hr); - ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); + ok(!*value, "got %s\n", wine_dbgstr_w(value)); IXmlReader_Release(reader); IStream_Release(stream);

1 0

Hugh McMaster : regedit: Re-implement processRegLinesA().
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: f56d919ffe21e04e60301eef9f8d29f7bb16e108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56d919ffe21e04e60301eef9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 22 11:54:05 2017 +0000 regedit: Re-implement processRegLinesA(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 219 +++++++++++++++++---------------------- programs/regedit/tests/regedit.c | 14 +-- 2 files changed, 100 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f56d919ffe21e04e60301…

1 0

Hugh McMaster : regedit: Parse UTF-16 file header for validation.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: e1e79d12b3b8f455801e1356e4e10c8067cd5a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e79d12b3b8f455801e1356e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 22 11:53:53 2017 +0000 regedit: Parse UTF-16 file header for validation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 47 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a88f632..a88ca75 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -646,11 +646,34 @@ static void processRegEntry31(WCHAR *line) closeKey(); } -/* version constants */ +enum reg_versions { + REG_VERSION_31, + REG_VERSION_40, + REG_VERSION_50, + REG_VERSION_INVALID +}; + +static enum reg_versions parse_file_header(WCHAR *s) +{ + static const WCHAR header_31[] = {'R','E','G','E','D','I','T',0}; + static const WCHAR header_40[] = {'R','E','G','E','D','I','T','4',0}; + static const WCHAR header_50[] = {'W','i','n','d','o','w','s',' ', + 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', + 'V','e','r','s','i','o','n',' ','5','.','0','0',0}; + + while (*s && (*s == ' ' || *s == '\t')) s++; -#define REG_VERSION_31 3 -#define REG_VERSION_40 4 -#define REG_VERSION_50 5 + if (!strcmpW(s, header_31)) + return REG_VERSION_31; + + if (!strcmpW(s, header_40)) + return REG_VERSION_40; + + if (!strcmpW(s, header_50)) + return REG_VERSION_50; + + return REG_VERSION_INVALID; +} /****************************************************************************** * Processes a registry file. @@ -799,6 +822,13 @@ static WCHAR *get_lineW(FILE *fp) static WCHAR *buf, *next; WCHAR *line; + if (!fp) + { + if (size) HeapFree(GetProcessHeap(), 0, buf); + size = 0; + return NULL; + } + if (!size) { size = REG_VAL_BUF_SIZE; @@ -861,6 +891,15 @@ static WCHAR *get_lineW(FILE *fp) static void processRegLinesW(FILE *fp) { WCHAR *line; + int reg_version; + + line = get_lineW(fp); + reg_version = parse_file_header(line); + if (reg_version == REG_VERSION_INVALID) + { + get_lineW(NULL); /* Reset static variables */ + return; + } while ((line = get_lineW(fp))) processRegEntry(line, TRUE);

1 0

Akihiro Sagawa : version: Add support for FILE_VER_GET_LOCALISED flag.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 7811de1b7334ab97b0701bfc5683649d63dc12ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7811de1b7334ab97b0701bfc5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 23 00:01:01 2017 +0900 version: Add support for FILE_VER_GET_LOCALISED flag. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 82 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 9c6869d..ed060c8 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -127,22 +127,30 @@ static inline int push_language( WORD *list, int pos, WORD lang ) * find_entry_language */ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir, - const void *root ) + const void *root, DWORD flags ) { const IMAGE_RESOURCE_DIRECTORY *ret; WORD list[9]; int i, pos = 0; - /* cf. LdrFindResource_U */ - pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) ); - pos = push_language( list, pos, LANGIDFROMLCID( NtCurrentTeb()->CurrentLocale ) ); - pos = push_language( list, pos, GetUserDefaultLangID() ); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_NEUTRAL )); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_DEFAULT )); - pos = push_language( list, pos, GetSystemDefaultLangID() ); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_NEUTRAL )); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_DEFAULT )); - pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + if (flags & FILE_VER_GET_LOCALISED) + { + /* cf. LdrFindResource_U */ + pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) ); + pos = push_language( list, pos, LANGIDFROMLCID( NtCurrentTeb()->CurrentLocale ) ); + pos = push_language( list, pos, GetUserDefaultLangID() ); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_NEUTRAL )); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_DEFAULT )); + pos = push_language( list, pos, GetSystemDefaultLangID() ); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_NEUTRAL )); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_DEFAULT )); + pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + } + else + { + /* FIXME: resolve LN file here */ + pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + } for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root ))) return ret; return find_entry_default( dir, root ); @@ -254,7 +262,7 @@ static BOOL find_ne_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) /*********************************************************************** * find_pe_resource [internal] */ -static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) +static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff, DWORD flags ) { union { @@ -356,7 +364,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) TRACE("No resid entry found\n" ); goto done; } - resPtr = find_entry_language( resPtr, resDir ); + resPtr = find_entry_language( resPtr, resDir, flags ); if ( !resPtr ) { TRACE("No default language entry found\n" ); @@ -393,7 +401,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) /*********************************************************************** * find_version_resource [internal] */ -static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset ) +static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset, DWORD flags ) { DWORD magic = read_xx_header( lzfd ); @@ -403,7 +411,7 @@ static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset ) if (!find_ne_resource( lzfd, reslen, offset )) magic = 0; break; case IMAGE_NT_SIGNATURE: - if (!find_pe_resource( lzfd, reslen, offset )) magic = 0; + if (!find_pe_resource( lzfd, reslen, offset, flags )) magic = 0; break; } return magic; @@ -607,7 +615,7 @@ typedef struct */ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) { - return GetFileVersionInfoSizeExW( 0, filename, handle ); + return GetFileVersionInfoSizeExW( FILE_VER_GET_LOCALISED, filename, handle ); } /*********************************************************************** @@ -615,7 +623,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) */ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle ) { - return GetFileVersionInfoSizeExA( 0, filename, handle ); + return GetFileVersionInfoSizeExA( FILE_VER_GET_LOCALISED, filename, handle ); } /****************************************************************************** @@ -642,19 +650,27 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h SetLastError(ERROR_BAD_PATHNAME); return 0; } - if (flags) - FIXME("flags 0x%x ignored\n", flags); + if (flags & ~FILE_VER_GET_LOCALISED) + FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED); if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { - magic = find_version_resource( lzfd, &len, &offset ); + magic = find_version_resource( lzfd, &len, &offset, flags ); LZClose( lzfd ); } if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { - HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO ); + HRSRC hRsrc = NULL; + if (!(flags & FILE_VER_GET_LOCALISED)) + { + LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO, english ); + } + if (!hRsrc) + hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO ); if (hRsrc) { magic = IMAGE_NT_SIGNATURE; @@ -736,12 +752,12 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle, SetLastError(ERROR_INVALID_DATA); return FALSE; } - if (flags) - FIXME("flags 0x%x ignored\n", flags); + if (flags & ~FILE_VER_GET_LOCALISED) + FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED); if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { - if ((magic = find_version_resource( lzfd, &len, &offset )) > 1) + if ((magic = find_version_resource( lzfd, &len, &offset, flags )) > 1) { LZSeek( lzfd, offset, 0 /* SEEK_SET */ ); len = LZRead( lzfd, data, min( len, datasize ) ); @@ -751,8 +767,16 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle, if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { - HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO ); + HRSRC hRsrc = NULL; + if (!(flags & FILE_VER_GET_LOCALISED)) + { + LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO, english ); + } + if (!hRsrc) + hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO ); if (hRsrc) { HGLOBAL hMem = LoadResource( hModule, hRsrc ); @@ -820,7 +844,7 @@ BOOL WINAPI GetFileVersionInfoExA( DWORD flags, LPCSTR filename, DWORD handle, D */ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { - return GetFileVersionInfoExW(0, filename, handle, datasize, data); + return GetFileVersionInfoExW(FILE_VER_GET_LOCALISED, filename, handle, datasize, data); } /*********************************************************************** @@ -828,7 +852,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, */ BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { - return GetFileVersionInfoExA(0, filename, handle, datasize, data); + return GetFileVersionInfoExA(FILE_VER_GET_LOCALISED, filename, handle, datasize, data); } /***********************************************************************

1 0