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

Henri Verbeet : usp10: Introduce an enumeration for script types.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: a523b46d0bd63a15bafbd2b0b0d13a09ffbe9d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a523b46d0bd63a15bafbd2b0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 7 08:57:28 2017 +0100 usp10: Introduce an enumeration for script types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 51 ++++++------ dlls/usp10/usp10_internal.h | 192 ++++++++++++++++++++++---------------------- 2 files changed, 123 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a523b46d0bd63a15bafbd…

1 0

Henri Verbeet : usp10: Use bsearch() to lookup the script range in get_char_script().
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 3c704c2c16237167d356cbc174602aebe3b08bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c704c2c16237167d356cbc17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 7 08:57:29 2017 +0100 usp10: Use bsearch() to lookup the script range in get_char_script(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 45 +++++++++++++++++++++++---------------------- dlls/usp10/usp10_internal.h | 3 +++ 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6711347..8a8a62f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); -static const struct +static const struct usp10_script_range { enum usp10_script script; DWORD rangeFirst; @@ -51,7 +51,7 @@ static const struct enum usp10_script numericScript; enum usp10_script punctScript; } -scriptRanges[] = +script_ranges[] = { /* Basic Latin: U+0000–U+007A */ { Script_Latin, 0x00, 0x07a , Script_Numeric, Script_Punctuation}, @@ -296,8 +296,6 @@ scriptRanges[] = { Script_Osmanya, 0x10480, 0x104AF, Script_Osmanya_Numeric, 0}, /* Mathematical Alphanumeric Symbols: U+1D400–U+1D7FF */ { Script_MathAlpha, 0x1D400, 0x1D7FF, 0, 0}, - /* END */ - { SCRIPT_UNDEFINED, 0, 0, 0} }; /* this must be in order so that the index matches the Script value */ @@ -888,13 +886,25 @@ static inline DWORD decode_surrogate_pair(LPCWSTR str, INT index, INT end) return 0; } +static int usp10_compare_script_range(const void *key, const void *value) +{ + const struct usp10_script_range *range = value; + const DWORD *ch = key; + + if (*ch < range->rangeFirst) + return -1; + if (*ch > range->rangeLast) + return 1; + return 0; +} + static enum usp10_script get_char_script(const WCHAR *str, unsigned int index, unsigned int end, unsigned int *consumed) { static const WCHAR latin_punc[] = {'#','$','&','\'',',',';','<','>','?','@','\\','^','_','`','{','|','}','~', 0x00a0, 0}; + struct usp10_script_range *range; WORD type = 0, type2 = 0; DWORD ch; - int i; *consumed = 1; @@ -936,24 +946,15 @@ static enum usp10_script get_char_script(const WCHAR *str, unsigned int index, else ch = str[index]; - i = 0; - do - { - if (ch < scriptRanges[i].rangeFirst || scriptRanges[i].script == SCRIPT_UNDEFINED) - break; - - if (ch >= scriptRanges[i].rangeFirst && ch <= scriptRanges[i].rangeLast) - { - if (scriptRanges[i].numericScript && (type & C1_DIGIT || type2 == C2_ARABICNUMBER)) - return scriptRanges[i].numericScript; - if (scriptRanges[i].punctScript && type & C1_PUNCT) - return scriptRanges[i].punctScript; - return scriptRanges[i].script; - } - i++; - } while (1); + if (!(range = bsearch(&ch, script_ranges, ARRAY_SIZE(script_ranges), + sizeof(*script_ranges), usp10_compare_script_range))) + return Script_Undefined; - return SCRIPT_UNDEFINED; + if (range->numericScript && (type & C1_DIGIT || type2 == C2_ARABICNUMBER)) + return range->numericScript; + if (range->punctScript && type & C1_PUNCT) + return range->punctScript; + return range->script; } static int compare_FindGlyph(const void *a, const void* b) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index dd1b9fa..989620d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -24,6 +24,9 @@ ( (ULONG)_x2 << 8 ) | \ (ULONG)_x1 ) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif enum usp10_script {

1 0

Michael Müller : kernel32: Add stub for GetCurrentPackageFamilyName.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: d2b98081fd107219bdadf284d7211303fdf86528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2b98081fd107219bdadf284d… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 8 02:13:24 2017 +0100 kernel32: Add stub for GetCurrentPackageFamilyName. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 3 ++- dlls/kernel32/version.c | 12 ++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 2c5cf9e..50f8594 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -3,7 +3,7 @@ @ stub FormatApplicationUserModelId @ stub GetApplicationUserModelId @ stub GetCurrentApplicationUserModelId -@ stub GetCurrentPackageFamilyName +@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernel32.GetCurrentPackageFamilyName @ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId @ stub GetCurrentPackageInfo diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 59e39a7..a144fd1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -628,8 +628,9 @@ # @ stub GetCurrentConsoleFontEx @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) -@ stdcall GetCurrentPackageId(ptr ptr) +@ stdcall GetCurrentPackageFamilyName(ptr ptr) @ stdcall GetCurrentPackageFullName(ptr ptr) +@ stdcall GetCurrentPackageId(ptr ptr) @ stdcall -norelay GetCurrentProcess() @ stdcall -norelay GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index cf783af..5a233ef 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -202,6 +202,9 @@ BOOL WINAPI GetProductInfo(DWORD dwOSMajorVersion, DWORD dwOSMinorVersion, DWORD dwSpMajorVersion, dwSpMinorVersion, pdwReturnedProductType); } +/*********************************************************************** + * GetCurrentPackageId (KERNEL32.@) + */ LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer) { FIXME("(%p %p): stub\n", len, buffer); @@ -209,6 +212,15 @@ LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer) } /*********************************************************************** + * GetCurrentPackageFamilyName (KERNEL32.@) + */ +LONG WINAPI GetCurrentPackageFamilyName(UINT32 *length, PWSTR name) +{ + FIXME("(%p %p): stub\n", length, name); + return APPMODEL_ERROR_NO_PACKAGE; +} + +/*********************************************************************** * GetCurrentPackageFullName (KERNEL32.@) */ LONG WINAPI GetCurrentPackageFullName(UINT32 *length, PWSTR name)

1 0

Michael Müller : cabinet: Set index of folder in FDICopy callback.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 67639e6ce7b88894009751b19051c58b7258f952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67639e6ce7b88894009751b19… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 8 01:07:36 2017 +0100 cabinet: Set index of folder in FDICopy callback. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/fdi.c | 2 ++ dlls/cabinet/tests/fdi.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index fdff0bf..758133e 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2640,6 +2640,7 @@ BOOL __cdecl FDICopy( fdin.date = file->date; fdin.time = file->time; fdin.attribs = file->attribs; + fdin.iFolder = file->index; if ((filehf = ((*pfnfdin)(fdintCOPY_FILE, &fdin))) == -1) { set_error( fdi, FDIERROR_USER_ABORT, 0 ); filehf = 0; @@ -2765,6 +2766,7 @@ BOOL __cdecl FDICopy( fdin.date = file->date; fdin.time = file->time; fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */ + fdin.iFolder = file->index; ((*pfnfdin)(fdintCLOSE_FILE_INFO, &fdin)); filehf = 0; diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index b5bec38..ba622f6 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -116,7 +116,7 @@ static const struct { { {'M','S','C','F'}, 0, 0x59, 0, sizeof(struct CFHEADER) + sizeof(struct CFFOLDER), 0, 3,1, 1, 1, 0, 0x1225, 0x2013 }, { sizeof(struct CFHEADER) + sizeof(struct CFFOLDER) + sizeof(struct CFFILE) + sizeof("file.dat"), 1, tcompTYPE_NONE }, - { sizeof("Hello World!")-1, 0, 0, 0x1225, 0x2013, 0xa114 }, + { sizeof("Hello World!")-1, 0, 0x1234, 0x1225, 0x2013, 0xa114 }, { 'f','i','l','e','.','d','a','t',0 }, { 0, sizeof("Hello World!")-1, sizeof("Hello World!")-1 }, { 'H','e','l','l','o',' ','W','o','r','l','d','!' } @@ -841,7 +841,7 @@ static INT_PTR CDECL fdi_mem_notify(FDINOTIFICATIONTYPE fdint, FDINOTIFICATION * ok(info->date == 0x1225, "expected 0x1225, got %#x\n", info->date); ok(info->time == 0x2013, "expected 0x2013, got %#x\n", info->time); ok(info->attribs == 0xa114, "expected 0xa114, got %#x\n", info->attribs); - ok(info->iFolder == 0, "expected 0, got %#x\n", info->iFolder); + ok(info->iFolder == 0x1234, "expected 0x1234, got %#x\n", info->iFolder); return 1; case fdintCOPY_FILE: @@ -850,6 +850,7 @@ static INT_PTR CDECL fdi_mem_notify(FDINOTIFICATIONTYPE fdint, FDINOTIFICATION * ok(info->cb == 12, "expected 12, got %u\n", info->cb); ok(!strcmp(info->psz1, expected), "expected %s, got %s\n", expected, info->psz1); + ok(info->iFolder == 0x1234, "expected 0x1234, got %#x\n", info->iFolder); return 0x12345678; /* call write() callback */ }

1 0

Bruno Jesus : wininet/test: Improve tests for InternetGetConnectedStateEx.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 7207b3dbc97a8d8e2653db3b6eda560efd339709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7207b3dbc97a8d8e2653db3b6… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Mon Mar 6 23:27:25 2017 -0300 wininet/test: Improve tests for InternetGetConnectedStateEx. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 49 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 9b32117..0b43d01 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1595,12 +1595,16 @@ static void test_InternetGetConnectedStateExA(void) return; } + flags = 0; + buffer[0] = 0; res = pInternetGetConnectedStateExA(&flags, buffer, sizeof(buffer), 0); + trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, buffer); +todo_wine + ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExA tests require a valid connection\n"); return; } - trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, buffer); res = pInternetGetConnectedStateExA(NULL, NULL, 0, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); @@ -1608,7 +1612,16 @@ static void test_InternetGetConnectedStateExA(void) flags = 0; res = pInternetGetConnectedStateExA(&flags, NULL, 0, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); - ok(flags, "Expected at least one flag set\n"); + if (flags & INTERNET_CONNECTION_CONFIGURED) + { + ok(flags & INTERNET_CONNECTION_MODEM, "Modem connection flag missing\n"); + ok(flags & ~INTERNET_CONNECTION_LAN, "Mixed Modem and LAN flags\n"); + } + else + { + ok(flags & INTERNET_CONNECTION_LAN, "LAN connection flag missing\n"); + ok(flags & ~INTERNET_CONNECTION_MODEM, "Mixed Modem and LAN flags\n"); + } buffer[0] = 0; flags = 0; @@ -1684,12 +1697,16 @@ static void test_InternetGetConnectedStateExW(void) return; } + flags = 0; + buffer[0] = 0; res = pInternetGetConnectedStateExW(&flags, buffer, sizeof(buffer) / sizeof(buffer[0]), 0); + trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); +todo_wine + ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExW tests require a valid connection\n"); return; } - trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); res = pInternetGetConnectedStateExW(NULL, NULL, 0, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); @@ -1697,7 +1714,16 @@ static void test_InternetGetConnectedStateExW(void) flags = 0; res = pInternetGetConnectedStateExW(&flags, NULL, 0, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); - ok(flags, "Expected at least one flag set\n"); + if (flags & INTERNET_CONNECTION_CONFIGURED) + { + ok(flags & INTERNET_CONNECTION_MODEM, "Modem connection flag missing\n"); + ok(flags & ~INTERNET_CONNECTION_LAN, "Mixed Modem and LAN flags\n"); + } + else + { + ok(flags & INTERNET_CONNECTION_LAN, "LAN connection flag missing\n"); + ok(flags & ~INTERNET_CONNECTION_MODEM, "Mixed Modem and LAN flags\n"); + } buffer[0] = 0; flags = 0; @@ -1731,14 +1757,20 @@ static void test_InternetGetConnectedStateExW(void) res = pInternetGetConnectedStateExW(&flags, buffer, sz, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz - 1, lstrlenW(buffer)); + if (flags & INTERNET_CONNECTION_MODEM) + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + else + ok(sz - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz - 1, lstrlenW(buffer)); buffer[0] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, sz / 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz / 2 - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz / 2 - 1, lstrlenW(buffer)); + if (flags & INTERNET_CONNECTION_MODEM) + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + else + ok(sz / 2 - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz / 2 - 1, lstrlenW(buffer)); buffer[0] = 0; flags = 0; @@ -1752,7 +1784,10 @@ static void test_InternetGetConnectedStateExW(void) res = pInternetGetConnectedStateExW(&flags, buffer, 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(lstrlenW(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenW(buffer)); + if (flags & INTERNET_CONNECTION_MODEM) + ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + else + ok(lstrlenW(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenW(buffer)); buffer[0] = 0xDEAD; flags = 0;

1 0

Nikolay Sivov : xmllite/tests: A couple of newline normalization tests for text nodes.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 2d3ec1247d4695b65a7f91eda6a6cafd973af89b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3ec1247d4695b65a7f91eda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 07:07:07 2017 +0300 xmllite/tests: A couple of newline normalization tests for text nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 60652ee..ebf4f5d 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1724,6 +1724,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 }, { NULL } }; @@ -1748,17 +1750,13 @@ static void test_read_text(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - /* read one more to get to CDATA */ + /* read one more to get to text node */ if (type == XmlNodeType_Element) { type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); } - - if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); - else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str;

1 0

Nikolay Sivov : xmllite/reader: Fix GetValue() for comments.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 63c489fab5c669b5a976c33ebcc9f2ee5eb1695a URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c489fab5c669b5a976c33eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 07:07:08 2017 +0300 xmllite/reader: Fix GetValue() for comments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/reader.c | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a52e928..4ea0a2a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3060,7 +3060,7 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, *value = NULL; - if ((reader->nodetype == XmlNodeType_Comment && !val->str) || is_reader_pending(reader)) + if ((reader->nodetype == XmlNodeType_Comment && !val->str && !val->len) || is_reader_pending(reader)) { XmlNodeType type; HRESULT hr; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index ebf4f5d..8c68610 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -954,18 +954,47 @@ static struct test_entry comment_tests[] = { static void test_read_comment(void) { + static const char *teststr = "<a>text</a>"; struct test_entry *test = comment_tests; + static const XmlNodeType types[] = + { + XmlNodeType_Element, + XmlNodeType_Text, + XmlNodeType_Comment, + XmlNodeType_EndElement, + }; + unsigned int i = 0; IXmlReader *reader; + XmlNodeType type; + IStream *stream; HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); - while (test->xml) + stream = create_stream_on_data(teststr, strlen(teststr)); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + while (IXmlReader_Read(reader, &type) == S_OK) { - XmlNodeType type; - IStream *stream; + const WCHAR *value; + ok(type == types[i], "%d: unexpected node type %d\n", i, type); + + if (type == XmlNodeType_Text || type == XmlNodeType_Comment) + { + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(*value != 0, "Expected node value\n"); + } + i++; + } + + IStream_Release(stream); + + while (test->xml) + { stream = create_stream_on_data(test->xml, strlen(test->xml)+1); hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : xmllite/reader: Return empty string for namespace uri for some nodes.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 3697bd9acfa4a3067105af7a1b6622a5781d5320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3697bd9acfa4a3067105af7a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 07:07:09 2017 +0300 xmllite/reader: Return empty string for namespace uri for some nodes. 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 | 23 ++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 4ea0a2a..36eba37 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3011,6 +3011,15 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * } } break; + case XmlNodeType_Text: + case XmlNodeType_CDATA: + case XmlNodeType_ProcessingInstruction: + case XmlNodeType_Comment: + case XmlNodeType_Whitespace: + case XmlNodeType_XmlDeclaration: + *uri = emptyW; + *len = 0; + break; default: FIXME("Unhandled node type %d\n", nodetype); return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 8c68610..7632d63 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2116,6 +2116,18 @@ static void test_namespaceuri(void) { "defns a", "ns r", "defns a" }}, { "<a><b><c/></b></a>", { "", "", "", "", "" }}, + { "<a>text</a>", + { "", "", "" }}, + { "<a>\r\n</a>", + { "", "", "" }}, + { "<a><![CDATA[data]]></a>", + { "", "", "" }}, + { "<?xml version=\"1.0\" ?><a/>", + { "", "" }}, + { "<a><?pi ?></a>", + { "", "", "" }}, + { "<a></a>", + { "", "", "" }}, }; IXmlReader *reader; XmlNodeType type; @@ -2137,13 +2149,22 @@ static void test_namespaceuri(void) const WCHAR *uri, *local; WCHAR *uriW; - ok(type == XmlNodeType_Element || type == XmlNodeType_EndElement, "Unexpected node type %d.\n", type); + ok(type == XmlNodeType_Element || + type == XmlNodeType_Text || + type == XmlNodeType_CDATA || + type == XmlNodeType_ProcessingInstruction || + type == XmlNodeType_Comment || + type == XmlNodeType_Whitespace || + type == XmlNodeType_EndElement || + type == XmlNodeType_XmlDeclaration, "Unexpected node type %d.\n", type); hr = IXmlReader_GetLocalName(reader, &local, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); + uri = NULL; hr = IXmlReader_GetNamespaceUri(reader, &uri, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(uri != NULL, "Unexpected NULL uri pointer\n"); uriW = a2w(uri_tests[i].uri[j]); ok(!lstrcmpW(uriW, uri), "%s: uri %s\n", wine_dbgstr_w(local), wine_dbgstr_w(uri));

1 0

Nikolay Sivov : xmllite/reader: Return local element names from the stack, instead of input buffer.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 3ae1043fc1ab55f0c52d32ce7f23892b87664f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae1043fc1ab55f0c52d32ce7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 07:07:10 2017 +0300 xmllite/reader: Return local element names from the stack, instead of input buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 37 +++++++++++++++++++++++++++++++------ dlls/xmllite/tests/reader.c | 12 +++++++++++- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 36eba37..9c7d0f1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2260,7 +2260,7 @@ static HRESULT reader_parse_element(xmlreader *reader) static HRESULT reader_parse_endtag(xmlreader *reader) { strval prefix, local, qname; - struct element *elem; + struct element *element; HRESULT hr; /* skip '</' */ @@ -2278,12 +2278,12 @@ static HRESULT reader_parse_endtag(xmlreader *reader) /* Element stack should never be empty at this point, cause we shouldn't get to content parsing if it's empty. */ - elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); - if (!strval_eq(reader, &elem->qname, &qname)) return WC_E_ELEMENTMATCH; + element = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + if (!strval_eq(reader, &element->qname, &qname)) return WC_E_ELEMENTMATCH; reader->nodetype = XmlNodeType_EndElement; + reader->is_empty_element = FALSE; reader_set_strvalue(reader, StringValue_Prefix, &prefix); - reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); return S_OK; @@ -3031,10 +3031,35 @@ 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); - *name = This->strvalues[StringValue_LocalName].str; - if (len) *len = This->strvalues[StringValue_LocalName].len; + + if (!len) + len = &length; + + switch ((nodetype = reader_get_nodetype(This))) + { + case XmlNodeType_Element: + case XmlNodeType_EndElement: + /* empty elements are not added to the stack */ + if (!This->is_empty_element) + { + struct element *element; + + element = LIST_ENTRY(list_head(&This->elements), struct element, entry); + *name = element->localname.str; + *len = element->localname.len; + break; + } + /* fallthrough */ + default: + *name = This->strvalues[StringValue_LocalName].str; + *len = This->strvalues[StringValue_LocalName].len; + break; + } + return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7632d63..08905d0 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2148,6 +2148,7 @@ static void test_namespaceuri(void) while (IXmlReader_Read(reader, &type) == S_OK) { const WCHAR *uri, *local; WCHAR *uriW; + UINT length; ok(type == XmlNodeType_Element || type == XmlNodeType_Text || @@ -2158,8 +2159,17 @@ static void test_namespaceuri(void) type == XmlNodeType_EndElement || type == XmlNodeType_XmlDeclaration, "Unexpected node type %d.\n", type); - hr = IXmlReader_GetLocalName(reader, &local, NULL); + local = NULL; + length = 0; + hr = IXmlReader_GetLocalName(reader, &local, &length); ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(local != NULL, "Unexpected NULL local name pointer\n"); + + if (type == XmlNodeType_Element || type == XmlNodeType_EndElement) + { + ok(*local != 0, "Unexpected empty local name\n"); + ok(length > 0, "Unexpected local name length\n"); + } uri = NULL; hr = IXmlReader_GetNamespaceUri(reader, &uri, NULL);

1 0

Nikolay Sivov : xmllite/reader: Return qualified element names from the stack, instead of input buffer.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: b57589a32d2156d22abce0f02b15da2f793ccdf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57589a32d2156d22abce0f02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 07:07:11 2017 +0300 xmllite/reader: Return qualified element names from the stack, instead of input buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 30 +++++++++++++++++++++++++++--- dlls/xmllite/tests/reader.c | 18 +++++++++++++++--- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9c7d0f1..ba7a56e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2284,7 +2284,6 @@ static HRESULT reader_parse_endtag(xmlreader *reader) reader->nodetype = XmlNodeType_EndElement; reader->is_empty_element = FALSE; reader_set_strvalue(reader, StringValue_Prefix, &prefix); - reader_set_strvalue(reader, StringValue_QualifiedName, &qname); return S_OK; } @@ -2913,10 +2912,35 @@ 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); - *name = This->strvalues[StringValue_QualifiedName].str; - if (len) *len = This->strvalues[StringValue_QualifiedName].len; + + if (!len) + len = &length; + + switch ((nodetype = reader_get_nodetype(This))) + { + case XmlNodeType_Element: + case XmlNodeType_EndElement: + /* empty elements are not added to the stack */ + if (!This->is_empty_element) + { + struct element *element; + + element = LIST_ENTRY(list_head(&This->elements), struct element, entry); + *name = element->qname.str; + *len = element->qname.len; + break; + } + /* fallthrough */ + default: + *name = This->strvalues[StringValue_QualifiedName].str; + *len = This->strvalues[StringValue_QualifiedName].len; + break; + } + return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 08905d0..1d32678 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2146,9 +2146,9 @@ static void test_namespaceuri(void) type = ~0u; while (IXmlReader_Read(reader, &type) == S_OK) { - const WCHAR *uri, *local; + const WCHAR *uri, *local, *qname; + UINT length, length2; WCHAR *uriW; - UINT length; ok(type == XmlNodeType_Element || type == XmlNodeType_Text || @@ -2165,10 +2165,22 @@ static void test_namespaceuri(void) ok(hr == S_OK, "S_OK, got %08x\n", hr); ok(local != NULL, "Unexpected NULL local name pointer\n"); - if (type == XmlNodeType_Element || type == XmlNodeType_EndElement) + qname = NULL; + length2 = 0; + hr = IXmlReader_GetQualifiedName(reader, &qname, &length2); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(qname != NULL, "Unexpected NULL qualified name pointer\n"); + + if (type == XmlNodeType_Element || + type == XmlNodeType_EndElement || + type == XmlNodeType_ProcessingInstruction || + type == XmlNodeType_XmlDeclaration) { ok(*local != 0, "Unexpected empty local name\n"); ok(length > 0, "Unexpected local name length\n"); + + ok(*qname != 0, "Unexpected empty qualified name\n"); + ok(length2 > 0, "Unexpected qualified name length\n"); } uri = NULL;

1 0