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

Alexandre Julliard : Release 2.3.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: a2460b2424163bbf5b885db6a5423c3d98f883e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2460b2424163bbf5b885db6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 21:18:32 2017 +0100 Release 2.3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 919 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 446 insertions(+), 495 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2460b2424163bbf5b885…

1 0

Tag wine-2.3 : Alexandre Julliard : Release 2.3
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: refs/tags/wine-2.3 Tag: 85fd4325002ee530afaeb4a5d067623c33ba6f0a URL: http://source.winehq.org/git/wine.git/?a=tag;h=85fd4325002ee530afaeb4a5d067… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 21:18:32 2017 +0100 Release 2.3

1 0

Nikolay Sivov : xmllite/reader: Fix writing back resolved character reference value.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 107615da7f07cfbc69c8f23c3c416c60fc27a9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107615da7f07cfbc69c8f23c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 3 00:11:28 2017 +0300 xmllite/reader: Fix writing back resolved character reference value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9bb0d56..a880bee 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2054,8 +2054,12 @@ static HRESULT reader_parse_reference(xmlreader *reader) /* normalize */ if (is_wchar_space(ch)) ch = ' '; - len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); - memmove(start+1, ptr+1, len); + ptr = reader_get_ptr(reader); + start = reader_get_ptr2(reader, cur); + len = buffer->written - ((char *)ptr - buffer->data); + memmove(start + 1, ptr + 1, len); + + buffer->written -= (reader_get_cur(reader) - cur) * sizeof(WCHAR); buffer->cur = cur + 1; *start = ch;

1 0

Bruno Jesus : ws2_32/tests: Rework WSAStringToAddress tests.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 49a2d1b80230cbd6e4c1c645a85ef1dc080484a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a2d1b80230cbd6e4c1c645a… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Thu Mar 2 22:21:43 2017 -0300 ws2_32/tests: Rework WSAStringToAddress tests. Current IPv6 tests were hiddenly failing in wine due to overly acceptive ok calls. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 72 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b61905e..bf90ce5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3397,15 +3397,27 @@ static void test_WSAStringToAddressA(void) (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressA() failed unexpectedly: %d\n", GLE ); + len = sizeof(sockaddr); + + ret = WSAStringToAddressA( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressA() should have failed with %d\n", GLE ); + len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); sockaddr6.sin6_family = AF_INET6; ret = WSAStringToAddressA( address6, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); + if (ret == SOCKET_ERROR) + { + win_skip("IPv6 not supported\n"); + return; + } + GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); + ok( ret == 0, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3414,8 +3426,8 @@ static void test_WSAStringToAddressA(void) ret = WSAStringToAddressA( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); +todo_wine + ok( ret == 0, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3424,16 +3436,23 @@ static void test_WSAStringToAddressA(void) ret = WSAStringToAddressA( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( (ret == 0 && sockaddr6.sin6_port == 0xffff) || - (ret == SOCKET_ERROR && GLE == WSAEINVAL), +todo_wine + ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); - len = sizeof(sockaddr); + len = sizeof(sockaddr6); - ret = WSAStringToAddressA( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + ret = WSAStringToAddressA( address7 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressA() should have failed with %d\n", GLE ); + "WSAStringToAddressW() should have failed with %d\n", GLE ); + + len = sizeof(sockaddr6); + + ret = WSAStringToAddressA( address8 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() should have failed with %d\n", GLE ); } static void test_WSAStringToAddressW(void) @@ -3520,15 +3539,27 @@ static void test_WSAStringToAddressW(void) broken(len == sizeof(SOCKADDR_STORAGE)) /* NT4/2k */, "unexpected length %d\n", len ); + len = sizeof(sockaddr); + + ret = WSAStringToAddressW( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() should have failed with %d\n", GLE ); + len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); sockaddr6.sin6_family = AF_INET6; ret = WSAStringToAddressW( address6, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); + if (ret == SOCKET_ERROR) + { + win_skip("IPv6 not supported\n"); + return; + } + GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); + ok( ret == 0, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3537,8 +3568,8 @@ static void test_WSAStringToAddressW(void) ret = WSAStringToAddressW( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); +todo_wine + ok( ret == 0, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3547,13 +3578,20 @@ static void test_WSAStringToAddressW(void) ret = WSAStringToAddressW( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( (ret == 0 && sockaddr6.sin6_port == 0xffff) || - (ret == SOCKET_ERROR && GLE == WSAEINVAL), +todo_wine + ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); - len = sizeof(sockaddr); + len = sizeof(sockaddr6); - ret = WSAStringToAddressW( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + ret = WSAStringToAddressW( address7 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() should have failed with %d\n", GLE ); + + len = sizeof(sockaddr6); + + ret = WSAStringToAddressW( address8 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), "WSAStringToAddressW() should have failed with %d\n", GLE );

1 0

Bruno Jesus : ws2_32: Fix WSAStringToAddress parsing for IPv6.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: b60cd6830848431e359196bb1d801e93d0952fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b60cd6830848431e359196bb1… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Thu Mar 2 22:21:44 2017 -0300 ws2_32: Fix WSAStringToAddress parsing for IPv6. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 36 ++++++++++++++++++------------------ dlls/ws2_32/tests/sock.c | 4 ---- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 451c505..d13fbf4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8255,10 +8255,6 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, ((LPSOCKADDR_IN)lpAddress)->sin_port = htons(atoi(ptrPort+1)); *ptrPort = '\0'; } - else - { - ((LPSOCKADDR_IN)lpAddress)->sin_port = 0; - } if(inet_aton(workBuffer, &inetaddr) > 0) { @@ -8269,11 +8265,12 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, res = WSAEINVAL; break; - } case WS_AF_INET6: { struct in6_addr inetaddr; + char *ptrAddr = workBuffer; + /* If lpAddressLength is too small, tell caller the size we need */ if (*lpAddressLength < sizeof(SOCKADDR_IN6)) { @@ -8287,24 +8284,27 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, ((LPSOCKADDR_IN6)lpAddress)->sin6_family = WS_AF_INET6; - /* This one is a bit tricky. An IPv6 address contains colons, so the - * check from IPv4 doesn't work like that. However, IPv6 addresses that - * contain a port are written with braces like [fd12:3456:7890::1]:12345 - * so what we will do is to look for ']', check if the next char is a - * colon, and if it is, parse the port as in IPv4. */ + /* Valid IPv6 addresses can also be surrounded by [ ], and in this case + * a port number may follow after like in [fd12:3456:7890::1]:12345 + * We need to cut the brackets and find the port if any. */ - ptrPort = strchr(workBuffer, ']'); - if(ptrPort && *(++ptrPort) == ':') + if(*workBuffer == '[') { - ((LPSOCKADDR_IN6)lpAddress)->sin6_port = htons(atoi(ptrPort+1)); + ptrPort = strchr(workBuffer, ']'); + if (!ptrPort) + { + SetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + + if (ptrPort[1] == ':') + ((LPSOCKADDR_IN6)lpAddress)->sin6_port = htons(atoi(ptrPort + 2)); + *ptrPort = '\0'; - } - else - { - ((LPSOCKADDR_IN6)lpAddress)->sin6_port = 0; + ptrAddr = workBuffer + 1; } - if(inet_pton(AF_INET6, workBuffer, &inetaddr) > 0) + if(inet_pton(AF_INET6, ptrAddr, &inetaddr) > 0) { memcpy(&((LPSOCKADDR_IN6)lpAddress)->sin6_addr, &inetaddr, sizeof(struct in6_addr)); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bf90ce5..c77f43b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3426,7 +3426,6 @@ static void test_WSAStringToAddressA(void) ret = WSAStringToAddressA( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); @@ -3436,7 +3435,6 @@ todo_wine ret = WSAStringToAddressA( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); @@ -3568,7 +3566,6 @@ static void test_WSAStringToAddressW(void) ret = WSAStringToAddressW( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); @@ -3578,7 +3575,6 @@ todo_wine ret = WSAStringToAddressW( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE);

1 0

Huw Davies : riched20: Write the char format for the end-of-paragraph marker.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 3d291dd7eed2524e857ae2075f550441b694abb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d291dd7eed2524e857ae2075… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 3 10:10:41 2017 +0000 riched20: Write the char format for the end-of-paragraph marker. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/writer.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5e71e51..ef53c56 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3951,7 +3951,7 @@ static void test_EM_STREAMOUT_empty_para(void) SendMessageA(hwnd, EM_STREAMOUT, SF_RTF, (LPARAM)&es); ok((p = strstr(buf, "\\pard")) != NULL, "missing \\pard\n"); - todo_wine ok(((p = strstr(p, "\\fs")) && isdigit(p[3])), "missing \\fs\n"); + ok(((p = strstr(p, "\\fs")) && isdigit(p[3])), "missing \\fs\n"); DestroyWindow(hwnd); } diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index baa2886..809b93e 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1074,6 +1074,9 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, } nChars--; } else if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) { + if (!ME_StreamOutRTFCharProps(pStream, &cursor.pRun->member.run.style->fmt)) + return FALSE; + if (cursor.pPara->member.para.fmt.dwMask & PFM_TABLE && cursor.pPara->member.para.fmt.wEffects & PFE_TABLE && !(cursor.pPara->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL)))

1 0

Huw Davies : riched20: Remove a hack that should be longer be needed.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 8b79854d701741c50182bc8af77fb66f57dc5452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b79854d701741c50182bc8af… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 3 10:10:42 2017 +0000 riched20: Remove a hack that should be longer be needed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 809b93e..fe768fa 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -382,14 +382,6 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; - /* It seems like Open Office ignores \deff0 tag at RTF-header. - As result it can't correctly parse text before first \fN tag, - so we can put \f0 immediately after font table. This forces - parser to use the same font, that \deff0 specifies. - It makes OOffice happy */ - if (!ME_StreamOutPrint(pStream, "\\f0")) - return FALSE; - /* Output the color table */ if (!ME_StreamOutPrint(pStream, "{\\colortbl;")) return FALSE; /* first entry is auto-color */ for (i = 1; i < pStream->nColorTblLen; i++)

1 0

Huw Davies : riched20: Add linefeeds after the colortbl and generator groups.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 6bcf4d60371fba3fa357943a985236047e18f1d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bcf4d60371fba3fa357943a9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 3 10:10:43 2017 +0000 riched20: Add linefeeds after the colortbl and generator groups. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index fe768fa..d579084 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -390,7 +390,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, (pStream->colortbl[i] >> 8) & 0xFF, (pStream->colortbl[i] >> 16) & 0xFF)) return FALSE; } - if (!ME_StreamOutPrint(pStream, "}")) return FALSE; + if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; return TRUE; } @@ -1017,7 +1017,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, /* TODO: stylesheet table */ - if (!ME_StreamOutPrint(pStream, "{\\*\\generator Wine Riched20 2.0;}")) + if (!ME_StreamOutPrint(pStream, "{\\*\\generator Wine Riched20 2.0;}\r\n")) return FALSE; /* TODO: information group */

1 0

Hans Leidekker : msi: Implement MsiGetComponentPathExA/W.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 64c0625f25e93ef9e9ef37876b93263ea06ed67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c0625f25e93ef9e9ef37876… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 3 11:52:36 2017 +0100 msi: Implement MsiGetComponentPathExA/W. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 108 ++++++++++------- dlls/msi/msi.spec | 4 +- dlls/msi/tests/msi.c | 322 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/msi.h | 4 + 4 files changed, 396 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64c0625f25e93ef9e9ef3…

1 0

Nikolay Sivov : xmllite/writer: Implement WriteString().
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 9c988e7b0e4c4cd63846f050dfa91990474629ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c988e7b0e4c4cd63846f050d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 3 14:14:34 2017 +0300 xmllite/writer: Implement WriteString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 86 ++++++++++++++++++++++++++++++++++++++++++--- dlls/xmllite/writer.c | 40 +++++++++++++++++++-- 2 files changed, 119 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 661b837..2a97a75 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -33,10 +33,10 @@ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, static void check_output(IStream *stream, const char *expected, BOOL todo, int line) { - HGLOBAL hglobal; int len = strlen(expected), size; - char *ptr; + HGLOBAL hglobal; HRESULT hr; + char *ptr; hr = GetHGlobalFromStream(stream, &hglobal); ok_(__FILE__, line)(hr == S_OK, "got 0x%08x\n", hr); @@ -48,10 +48,10 @@ static void check_output(IStream *stream, const char *expected, BOOL todo, int l if (size != len) { ok_(__FILE__, line)(0, "data size mismatch, expected %u, got %u\n", len, size); - ok_(__FILE__, line)(0, "got %s, expected %s\n", ptr, expected); + ok_(__FILE__, line)(0, "got |%s|, expected |%s|\n", ptr, expected); } else - ok_(__FILE__, line)(!strncmp(ptr, expected, len), "got %s, expected %s\n", ptr, expected); + ok_(__FILE__, line)(!strncmp(ptr, expected, len), "got |%s|, expected |%s|\n", ptr, expected); } GlobalUnlock(hglobal); } @@ -1258,6 +1258,83 @@ static void test_WriteCharEntity(void) IStream_Release(stream); } +static void test_WriteString(void) +{ + static const WCHAR markupW[] = {'<','&','"','>','=',0}; + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + static const WCHAR emptyW[] = {0}; + IXmlWriter *writer; + IStream *stream; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteString(writer, aW); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteString(writer, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteString(writer, emptyW); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteString(writer, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteString(writer, emptyW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteString(writer, aW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* WriteString automatically escapes markup characters */ + hr = IXmlWriter_WriteString(writer, markupW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<b>a<&\">="); + IStream_Release(stream); + + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteString(writer, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<b"); + + hr = IXmlWriter_WriteString(writer, emptyW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<b>"); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { test_writer_create(); @@ -1277,4 +1354,5 @@ START_TEST(writer) test_WriteAttributeString(); test_WriteFullEndElement(); test_WriteCharEntity(); + test_WriteString(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index f7f2604..55a53a6 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -1203,16 +1203,49 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre return S_OK; } -static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, LPCWSTR pwszText) +static void write_escaped_string(xmlwriter *writer, const WCHAR *string) +{ + static const WCHAR ampW[] = {'&','a','m','p',';'}; + static const WCHAR ltW[] = {'&','l','t',';'}; + static const WCHAR gtW[] = {'&','g','t',';'}; + + while (*string) + { + switch (*string) + { + case '<': + write_output_buffer(writer->output, ltW, ARRAY_SIZE(ltW)); + break; + case '&': + write_output_buffer(writer->output, ampW, ARRAY_SIZE(ampW)); + break; + case '>': + write_output_buffer(writer->output, gtW, ARRAY_SIZE(gtW)); + break; + default: + write_output_buffer(writer->output, string, 1); + } + + string++; + } +} + +static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, const WCHAR *string) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p %s\n", This, wine_dbgstr_w(pwszText)); + TRACE("%p %s\n", This, debugstr_w(string)); + + if (!string) + return S_OK; switch (This->state) { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; case XmlWriterState_Ready: case XmlWriterState_DocClosed: This->state = XmlWriterState_DocClosed; @@ -1221,7 +1254,8 @@ static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, LPCWSTR pwszText) ; } - return E_NOTIMPL; + write_escaped_string(This, string); + return S_OK; } static HRESULT WINAPI xmlwriter_WriteSurrogateCharEntity(IXmlWriter *iface, WCHAR wchLow, WCHAR wchHigh)

1 0