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

mshtml: Fixed ref count leak and code clean up.

This commit is contained in:
Jacek Caban 2009-11-24 21:12:40 +01:00 committed by Alexandre Julliard
parent ac85305c95
commit 5dd4248ff3
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/mshtml/tests/dom.c
View File

@ -5606,8 +5606,6 @@ static void test_frame(IDispatch *disp, const char *exp_id)
IHTMLDocument2 *parent_doc, *top_doc; IHTMLDocument2 *parent_doc, *top_doc;
IHTMLWindow4 *frame; IHTMLWindow4 *frame;
IHTMLFrameBase *frame_elem; IHTMLFrameBase *frame_elem;
IHTMLElement *html_elem;
BSTR bstr;
HRESULT hres; HRESULT hres;
hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow4, (void**)&frame); hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow4, (void**)&frame);
@ -5621,17 +5619,8 @@ static void test_frame(IDispatch *disp, const char *exp_id)
if(FAILED(hres)) if(FAILED(hres))
return; return;
hres = IHTMLFrameBase_QueryInterface(frame_elem, &IID_IHTMLElement, (void**)&html_elem); test_elem_id((IUnknown*)frame_elem, exp_id);
ok(hres == S_OK, "Could not get IHTMLElement interface: 0x%08x\n", hres); IHTMLElement_Release(frame_elem);
IHTMLFrameBase_Release(frame_elem);
if(FAILED(hres))
return;
hres = IHTMLElement_get_id(html_elem, &bstr);
ok(hres == S_OK, "IHTMLElement_get_id failed: 0x%08x\n", hres);
ok(!strcmp_wa(bstr, exp_id), "Expected ID: \"%s\", found ID: %s\n", exp_id, wine_dbgstr_w(bstr));
IHTMLElement_Release(html_elem);
SysFreeString(bstr);
hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow2, (void**)&frame2); hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow2, (void**)&frame2);
ok(hres == S_OK, "Could not get IHTMLWindow2 interface: 0x%08x\n", hres); ok(hres == S_OK, "Could not get IHTMLWindow2 interface: 0x%08x\n", hres);
@ -5653,11 +5642,8 @@ static void test_frame(IDispatch *disp, const char *exp_id)
return; return;
} }
hres = IHTMLDocument2_get_title(parent_doc, &bstr); test_doc_title(parent_doc, "frameset test");
ok(hres == S_OK, "IHTMLDocument2_get_title failed: 0x%08x\n", hres);
ok(!strcmp_wa(bstr, "frameset test"), "Did not get the right parent. Expected \"frameset test\", found %s\n", wine_dbgstr_w(bstr));
IHTMLDocument2_Release(parent_doc); IHTMLDocument2_Release(parent_doc);
SysFreeString(bstr);
/* test get_top */ /* test get_top */
hres = IHTMLWindow2_get_top(frame2, &top); hres = IHTMLWindow2_get_top(frame2, &top);
@ -5672,11 +5658,8 @@ static void test_frame(IDispatch *disp, const char *exp_id)
if(FAILED(hres)) if(FAILED(hres))
return; return;
hres = IHTMLDocument2_get_title(top_doc, &bstr); test_doc_title(top_doc, "frameset test");
ok(hres == S_OK, "IHTMLDocument2_get_title failed: 0x%08x\n", hres);
ok(!strcmp_wa(bstr, "frameset test"), "Did not get the right parent. Expected \"frameset test\", found %s\n", wine_dbgstr_w(bstr));
IHTMLDocument2_Release(top_doc); IHTMLDocument2_Release(top_doc);
SysFreeString(bstr);
} }
static void test_frameset(IHTMLDocument2 *doc) static void test_frameset(IHTMLDocument2 *doc)