diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 07d2fc60b10..0d9a0a85943 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -338,8 +338,33 @@ static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTM
static HRESULT WINAPI HTMLDocument_get_images(IHTMLDocument2 *iface, IHTMLElementCollection **p)
{
HTMLDocument *This = HTMLDOC_THIS(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+ nsIDOMHTMLCollection *nscoll = NULL;
+ nsresult nsres;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ if(!p)
+ return E_INVALIDARG;
+
+ *p = NULL;
+
+ if(!This->nsdoc) {
+ WARN("NULL nsdoc\n");
+ return E_UNEXPECTED;
+ }
+
+ nsres = nsIDOMHTMLDocument_GetImages(This->nsdoc, &nscoll);
+ if(NS_FAILED(nsres)) {
+ ERR("GetImages failed: %08x\n", nsres);
+ return E_FAIL;
+ }
+
+ if(nscoll) {
+ *p = create_collection_from_htmlcol(This, (IUnknown*)HTMLDOC(This), nscoll);
+ nsIDOMElement_Release(nscoll);
+ }
+
+ return S_OK;
}
static HRESULT WINAPI HTMLDocument_get_applets(IHTMLDocument2 *iface, IHTMLElementCollection **p)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index e21ead46d6f..36d4f2a8071 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -2765,10 +2765,22 @@ static void test_defaults(IHTMLDocument2 *doc)
IHTMLStyle *style;
long l;
HRESULT hres;
+ IHTMLElementCollection *colimages;
hres = IHTMLDocument2_get_body(doc, &elem);
ok(hres == S_OK, "get_body failed: %08x\n", hres);
+ hres = IHTMLDocument2_get_images(doc, NULL);
+ ok(hres == E_INVALIDARG, "hres %08x\n", hres);
+
+ hres = IHTMLDocument2_get_images(doc, &colimages);
+ ok(hres == S_OK, "get_images failed: %08x\n", hres);
+ if(hres == S_OK)
+ {
+ test_elem_collection((IUnknown*)colimages, NULL, 0);
+ IHTMLElementCollection_Release(colimages);
+ }
+
hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body);
ok(hres == S_OK, "Could not get IHTMBodyElement: %08x\n", hres);
test_default_body(body);
@@ -3049,6 +3061,7 @@ static void test_elems(IHTMLDocument2 *doc)
IDispatch *disp;
long type;
HRESULT hres;
+ IHTMLElementCollection *colimages;
static const WCHAR imgidW[] = {'i','m','g','i','d',0};
static const WCHAR inW[] = {'i','n',0};
@@ -3097,6 +3110,16 @@ static void test_elems(IHTMLDocument2 *doc)
test_elem_col_item(col, xW, item_types, sizeof(item_types)/sizeof(item_types[0]));
IHTMLElementCollection_Release(col);
+ hres = IHTMLDocument2_get_images(doc, &colimages);
+ ok(hres == S_OK, "get_images failed: %08x\n", hres);
+ if(hres == S_OK)
+ {
+ static const elem_type_t images_types[] = {ET_IMG};
+ test_elem_collection((IUnknown*)colimages, images_types, 1);
+
+ IHTMLElementCollection_Release(colimages);
+ }
+
elem = get_doc_elem(doc);
ok(hres == S_OK, "get_documentElement failed: %08x\n", hres);
hres = IHTMLElement_get_all(elem, &disp);