ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xmllite: Fix a test failure on Windows 8.

This commit is contained in:
Nikolay Sivov 2013-03-11 08:49:28 +04:00 committed by Alexandre Julliard
parent 88d7b66be2
commit e5a48b2d75
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/xmllite/reader.c
View File

@ -2246,6 +2246,8 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, LPCWSTR *value, UINT
TRACE("(%p)->(%p %p)\n", This, value, len); TRACE("(%p)->(%p %p)\n", This, value, len);
*value = NULL;
if ((This->nodetype == XmlNodeType_Comment && !This->strvalues[StringValue_Value].str) || if ((This->nodetype == XmlNodeType_Comment && !This->strvalues[StringValue_Value].str) ||
is_reader_pending(This)) is_reader_pending(This))
{ {

10
dlls/xmllite/tests/reader.c
View File

@ -1238,16 +1238,16 @@ static void test_read_pending(void)
int c; int c;
hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
ok(hr == S_OK, "S_OK, got %08x\n", hr); ok(hr == S_OK, "S_OK, got 0x%08x\n", hr);
hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream); hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
/* first read call returns incomplete node, second attempt fails with E_PENDING */ /* first read call returns incomplete node, second attempt fails with E_PENDING */
stream_readcall = 0; stream_readcall = 0;
type = XmlNodeType_Element; type = XmlNodeType_Element;
hr = IXmlReader_Read(reader, &type); hr = IXmlReader_Read(reader, &type);
ok(hr == S_OK || broken(hr == E_PENDING), "Expected S_OK, got %08x\n", hr); ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr);
/* newer versions are happy when it's enough data to detect node type, /* newer versions are happy when it's enough data to detect node type,
older versions keep reading until it fails to read more */ older versions keep reading until it fails to read more */
ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall);
@ -1257,8 +1257,8 @@ static void test_read_pending(void)
c = stream_readcall; c = stream_readcall;
value = (void*)0xdeadbeef; value = (void*)0xdeadbeef;
hr = IXmlReader_GetValue(reader, &value, NULL); hr = IXmlReader_GetValue(reader, &value, NULL);
ok(hr == E_PENDING, "Expected E_PENDING, got %08x\n", hr); ok(hr == E_PENDING, "got 0x%08x\n", hr);
ok(value == (void*)0xdeadbeef, "got %p\n", value); ok(value == NULL || broken(value == (void*)0xdeadbeef) /* Win8 sets it to NULL */, "got %p\n", value);
ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1); ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1);
IXmlReader_Release(reader); IXmlReader_Release(reader);