Module: wine Branch: master Commit: 2daff9cc6c1519486128c8e73bc17dafa040344a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2daff9cc6c1519486128c8e73b...
Author: Jacek Caban jacek@codeweavers.com Date: Sun Jul 31 16:46:01 2011 +0200
mshtml: Added IOmNavigator::get_appMinorVersion implementation.
---
dlls/mshtml/omnavigator.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 73e55dd..bfc3d23 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -693,8 +693,14 @@ static HRESULT WINAPI OmNavigator_get_platform(IOmNavigator *iface, BSTR *p) static HRESULT WINAPI OmNavigator_get_appMinorVersion(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + static const WCHAR zeroW[] = {'0',0}; + + TRACE("(%p)->(%p)\n", This, p); + + /* NOTE: MSIE returns "0" or values like ";SP2;". Returning "0" should be enough. */ + *p = SysAllocString(zeroW); + return S_OK; }
static HRESULT WINAPI OmNavigator_get_connectionSpeed(IOmNavigator *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bba222f..a7998d5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3942,6 +3942,12 @@ static void test_navigator(IHTMLDocument2 *doc) skip("nonstandard user agent\n"); }
+ bstr = NULL; + hres = IOmNavigator_get_appMinorVersion(navigator, &bstr); + ok(hres == S_OK, "get_appMonorVersion failed: %08x\n", hres); + ok(bstr != NULL, "appMinorVersion returned NULL\n"); + SysFreeString(bstr); + test_mime_types_col(navigator);
ref = IOmNavigator_Release(navigator);