Commit 9d662928 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

msxml3: Implement element stack and use it in related callbacks.

parent 17f0ee46
...@@ -327,8 +327,8 @@ static HRESULT WINAPI contentHandler_putDocumentLocator( ...@@ -327,8 +327,8 @@ static HRESULT WINAPI contentHandler_putDocumentLocator(
ISAXContentHandler* iface, ISAXContentHandler* iface,
ISAXLocator *pLocator) ISAXLocator *pLocator)
{ {
ISAXAttributes *attr; ISAXAttributes *attr, *attr1;
HRESULT hres; HRESULT hr;
if(!test_expect_call(CH_PUTDOCUMENTLOCATOR)) if(!test_expect_call(CH_PUTDOCUMENTLOCATOR))
return E_FAIL; return E_FAIL;
...@@ -338,9 +338,16 @@ static HRESULT WINAPI contentHandler_putDocumentLocator( ...@@ -338,9 +338,16 @@ static HRESULT WINAPI contentHandler_putDocumentLocator(
msxml_version>=6 ? expectCall->column_v6 : expectCall->column); msxml_version>=6 ? expectCall->column_v6 : expectCall->column);
if(msxml_version >= 6) { if(msxml_version >= 6) {
hres = ISAXLocator_QueryInterface(pLocator, &IID_ISAXAttributes, (void**)&attr); EXPECT_REF(pLocator, 1);
ok(hres == S_OK, "QueryInterface failed: %x\n", hres); hr = ISAXLocator_QueryInterface(pLocator, &IID_ISAXAttributes, (void**)&attr);
EXPECT_HR(hr, S_OK);
EXPECT_REF(pLocator, 2);
hr = ISAXLocator_QueryInterface(pLocator, &IID_ISAXAttributes, (void**)&attr1);
EXPECT_HR(hr, S_OK);
EXPECT_REF(pLocator, 3);
ok(attr == attr1, "got %p, %p\n", attr, attr1);
ISAXAttributes_Release(attr); ISAXAttributes_Release(attr);
ISAXAttributes_Release(attr1);
} }
return (expectCall++)->ret; return (expectCall++)->ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment