February 2014 - Wine-Commits

Jeremy Newman : WWN Issue 363
by Jeremy Newman Feb. 14, 2014

Feb. 14, 2014

Module: website Branch: master Commit: 3ae85ca89822a141cafd149176b2355572b5086c URL: http://source.winehq.org/git/website.git/?a=commit;h=3ae85ca89822a141cafd14… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 14 17:36:57 2014 -0600 WWN Issue 363 --- news/en/2014021401.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2014021401.xml b/news/en/2014021401.xml new file mode 100644 index 0000000..cb6633b --- /dev/null +++ b/news/en/2014021401.xml @@ -0,0 +1,13 @@ +<news> + <date>February 14, 2014</date> + <title>World Wine News Issue 363</title> + <body> +<a href="{$root}/wwn/363">WWN Issue 363</a> was released today. +<ul> +<li><a href="{$root}/wwn/363#WWN revived?">WWN revived?</a></li> +<li><a href="{$root}/wwn/363#Wine at LinuxTag in Berlin">Wine at LinuxTag in Berlin</a></li> +<li><a href="{$root}/wwn/363#FOSDEM 2014">FOSDEM 2014</a></li> +<li><a href="{$root}/wwn/363#AppDB/BugZilla Status Changes">AppDB/BugZilla Status Changes</a></li> +</ul> + </body> +</news>

1 0

Alexandre Julliard : ntdll: Trace missing exception info on ARM.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: 183c184565f941ac9d99f179912829eaf390c1ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=183c184565f941ac9d99f1799… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 14 13:51:19 2014 +0100 ntdll: Trace missing exception info on ARM. --- dlls/ntdll/signal_arm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index a681986..0eb7ce0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -521,6 +521,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f { DWORD c; + TRACE( "code=%x flags=%x addr=%p pc=%08x tid=%04x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + context->Pc, GetCurrentThreadId() ); for (c = 0; c < rec->NumberParameters; c++) TRACE( " info[%d]=%08lx\n", c, rec->ExceptionInformation[c] ); if (rec->ExceptionCode == EXCEPTION_WINE_STUB)

1 0

Dmitry Timoshkov : xmllite: Don't fail if encoding declaration is missing.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: 376eff51e0e48b931536f02859666e2a17d7373d URL: http://source.winehq.org/git/wine.git/?a=commit;h=376eff51e0e48b931536f0285… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 16:50:30 2014 +0900 xmllite: Don't fail if encoding declaration is missing. --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9fe48bd..35c3e31 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1096,7 +1096,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) strval name, val; HRESULT hr; - if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + if (!reader_skipspaces(reader)) return S_FALSE; if (reader_cmp(reader, encodingW)) return S_FALSE; name.str = reader_get_ptr(reader);

1 0

Dmitry Timoshkov : advapi32/tests: Fix test failures under Windows 2000 and some XP versions.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: 8ac05cf48e191deec12d0dca20fcd634e2d2cf01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac05cf48e191deec12d0dca2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 14 21:19:09 2014 +0900 advapi32/tests: Fix test failures under Windows 2000 and some XP versions. --- dlls/advapi32/tests/security.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e2e9cd5..f993c08 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4978,6 +4978,7 @@ static void test_filemap_security(void) { if (!mapping) { + /* NT4 and win2k don't support EXEC on file mappings */ if (prot_map[i].prot == PAGE_EXECUTE_READ || prot_map[i].prot == PAGE_EXECUTE_READWRITE || prot_map[i].prot == PAGE_EXECUTE_WRITECOPY) { win_skip("CreateFileMapping doesn't support PAGE_EXECUTE protection\n"); @@ -5001,6 +5002,14 @@ static void test_filemap_security(void) SetLastError(0xdeadbeef); mapping = CreateFileMappingW(file, NULL, PAGE_EXECUTE_READWRITE, 0, 4096, NULL); + if (!mapping) + { + /* NT4 and win2k don't support EXEC on file mappings */ + win_skip("CreateFileMapping doesn't support PAGE_EXECUTE protection\n"); + CloseHandle(file); + DeleteFileA(file_name); + return; + } ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); access = get_obj_access(mapping);

1 0

Dmitry Timoshkov : xmllite: Reader should set starting string offsets when encoding is being parsed.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: f78b4f305d2d158c4857282bbd54c94ebc4c9207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78b4f305d2d158c4857282bb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 12 16:58:06 2014 +0900 xmllite: Reader should set starting string offsets when encoding is being parsed. --- dlls/xmllite/reader.c | 3 +++ dlls/xmllite/tests/reader.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a0e95b4..6d20324 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1071,6 +1071,8 @@ static HRESULT reader_parse_encname(xmlreader *reader, strval *val) if ((*start < 'A' || *start > 'Z') && (*start < 'a' || *start > 'z')) return WC_E_ENCNAME; + val->start = reader_get_cur(reader); + ptr = start; while (is_wchar_encname(*++ptr)) ; @@ -1100,6 +1102,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) if (reader_cmp(reader, encodingW)) return S_FALSE; name.str = reader_get_ptr(reader); + name.start = reader_get_cur(reader); name.len = 8; /* skip 'encoding' */ reader_skipn(reader, 8); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index ad9b3a2..312516b 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -752,10 +752,6 @@ static void test_read_xmldeclaration(void) hr = IXmlReader_GetValue(reader, &val, &len); ok(hr == S_OK, "got %08x\n", hr); ok(len == lstrlenW(name_val[i].val), "expected %u, got %u\n", lstrlenW(name_val[i].val), len); - if (i == 1) -todo_wine - ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); - else ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); hr = IXmlReader_MoveToNextAttribute(reader);

1 0

Jacek Caban : mshtml: Use IWebBrowserPriv2IE9 instead of IWebBrowserPriv2IE8 in tests on IE9+.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: aa22a3c4b2e772636163ea50e7245dba01fe7b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa22a3c4b2e772636163ea50e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 14 16:45:00 2014 +0100 mshtml: Use IWebBrowserPriv2IE9 instead of IWebBrowserPriv2IE8 in tests on IE9+. --- dlls/mshtml/tests/htmldoc.c | 90 +++++++++++++++++++++++++++++++++---------- include/mshtml.idl | 15 ++++++++ 2 files changed, 84 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 95b8814..ed72685 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -204,6 +204,7 @@ DEFINE_EXPECT(EnumConnections_Next); DEFINE_EXPECT(WindowClosing); DEFINE_EXPECT(NavigateWithBindCtx); +static BOOL is_ie9plus; static IUnknown *doc_unk; static IMoniker *doc_mon; static BOOL expect_LockContainer_fLock; @@ -4259,6 +4260,19 @@ static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { static IConnectionPointContainer ConnectionPointContainer = { &ConnectionPointContainerVtbl }; +static void test_NavigateWithBindCtx(BSTR uri, VARIANT *flags, VARIANT *target_frame, VARIANT *post_data, + VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment) +{ + ok(!strcmp_wa(uri, nav_url), "uri = %s\n", wine_dbgstr_w(uri)); + ok(V_VT(flags) == VT_I4, "V_VT(flags) = %d\n", V_VT(flags)); + ok(V_I4(flags) == navHyperlink, "V_I4(flags) = %x\n", V_I4(flags)); + ok(!target_frame, "target_frame != NULL\n"); + ok(!post_data, "post_data != NULL\n"); + ok(!headers, "headers != NULL\n"); + ok(bind_ctx != NULL, "bind_ctx == NULL\n"); + ok(!url_fragment, "url_dragment = %s\n", wine_dbgstr_w(url_fragment)); +} + static HRESULT wb_qi(REFIID riid, void **ppv); static HRESULT WINAPI WebBrowserPriv_QueryInterface(IWebBrowserPriv *iface, REFIID riid, void **ppv) @@ -4284,15 +4298,7 @@ static HRESULT WINAPI WebBrowserPriv_NavigateWithBindCtx(IWebBrowserPriv *iface, CHECK_EXPECT(NavigateWithBindCtx); ok(V_VT(uri) == VT_BSTR, "V_VT(uri) = %d\n", V_VT(uri)); - ok(!strcmp_wa(V_BSTR(uri), nav_url), "V_BSTR(uri) = %s\n", wine_dbgstr_w(V_BSTR(uri))); - ok(V_VT(flags) == VT_I4, "V_VT(flags) = %d\n", V_VT(flags)); - ok(V_I4(flags) == navHyperlink, "V_I4(flags) = %x\n", V_I4(flags)); - ok(!target_frame, "target_frame != NULL\n"); - ok(!post_data, "post_data != NULL\n"); - ok(!headers, "headers != NULL\n"); - ok(bind_ctx != NULL, "bind_ctx == NULL\n"); - ok(!url_fragment, "url_dragment = %s\n", wine_dbgstr_w(url_fragment)); - + test_NavigateWithBindCtx(V_BSTR(uri), flags, target_frame, post_data, headers, bind_ctx, url_fragment); return S_OK; } @@ -4333,23 +4339,14 @@ static HRESULT WINAPI WebBrowserPriv2IE8_NavigateWithBindCtx2(IWebBrowserPriv2IE BSTR str; HRESULT hres; - trace("NavigateWithBindCtx2\n"); + trace("IE8: NavigateWithBindCtx2\n"); CHECK_EXPECT(NavigateWithBindCtx); hres = IUri_GetDisplayUri(uri, &str); ok(hres == S_OK, "GetDisplayUri failed: %08x\n", hres); - ok(!strcmp_wa(str, nav_url), "V_BSTR(uri) = %s\n", wine_dbgstr_w(str)); + test_NavigateWithBindCtx(str, flags, target_frame, post_data, headers, bind_ctx, url_fragment); SysFreeString(str); - - ok(V_VT(flags) == VT_I4, "V_VT(flags) = %d\n", V_VT(flags)); - ok(V_I4(flags) == navHyperlink, "V_I4(flags) = %x\n", V_I4(flags)); - ok(!target_frame, "target_frame != NULL\n"); - ok(!post_data, "post_data != NULL\n"); - ok(!headers, "headers != NULL\n"); - ok(bind_ctx != NULL, "bind_ctx == NULL\n"); - ok(!url_fragment, "url_dragment = %s\n", wine_dbgstr_w(url_fragment)); - return S_OK; } @@ -4418,6 +4415,47 @@ static const IWebBrowserPriv2IE8Vtbl WebBrowserPriv2IE8Vtbl = { static IWebBrowserPriv2IE8 WebBrowserPriv2IE8 = { &WebBrowserPriv2IE8Vtbl }; +static HRESULT WINAPI WebBrowserPriv2IE9_QueryInterface(IWebBrowserPriv2IE9 *iface, REFIID riid, void **ppv) +{ + return wb_qi(riid, ppv); +} + +static ULONG WINAPI WebBrowserPriv2IE9_AddRef(IWebBrowserPriv2IE9 *iface) +{ + return 2; +} + +static ULONG WINAPI WebBrowserPriv2IE9_Release(IWebBrowserPriv2IE9 *iface) +{ + return 1; +} + +static HRESULT WINAPI WebBrowserPriv2IE9_NavigateWithBindCtx2(IWebBrowserPriv2IE9 *iface, IUri *uri, VARIANT *flags, + VARIANT *target_frame, VARIANT *post_data, VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment, DWORD unknown) +{ + BSTR str; + HRESULT hres; + + trace("IE9: NavigateWithBindCtx2\n"); + + CHECK_EXPECT(NavigateWithBindCtx); + + hres = IUri_GetDisplayUri(uri, &str); + ok(hres == S_OK, "GetDisplayUri failed: %08x\n", hres); + test_NavigateWithBindCtx(str, flags, target_frame, post_data, headers, bind_ctx, url_fragment); + SysFreeString(str); + return S_OK; +} + +static const IWebBrowserPriv2IE9Vtbl WebBrowserPriv2IE9Vtbl = { + WebBrowserPriv2IE9_QueryInterface, + WebBrowserPriv2IE9_AddRef, + WebBrowserPriv2IE9_Release, + WebBrowserPriv2IE9_NavigateWithBindCtx2 +}; + +static IWebBrowserPriv2IE9 WebBrowserPriv2IE9 = { &WebBrowserPriv2IE9Vtbl }; + static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid, void **ppv) { return wb_qi(riid, ppv); @@ -4956,7 +4994,8 @@ static HRESULT wb_qi(REFIID riid, void **ppv) } if(IsEqualGUID(riid, &IID_IWebBrowserPriv2IE8)) { - *ppv = &WebBrowserPriv2IE8; + /* IE8 and IE9 versions use the same IID, but have different declarations. */ + *ppv = is_ie9plus ? (void*)&WebBrowserPriv2IE9 : (void*)&WebBrowserPriv2IE8; return S_OK; } @@ -8316,12 +8355,21 @@ static BOOL check_ie(void) { IHTMLDocument2 *doc; IHTMLDocument5 *doc5; + IHTMLDocument7 *doc7; HRESULT hres; doc = create_document(); if(!doc) return FALSE; + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument7, (void**)&doc7); + if(SUCCEEDED(hres)) { + is_ie9plus = TRUE; + IHTMLDocument7_Release(doc7); + } + + trace("is_ie9plus %x\n", is_ie9plus); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); if(SUCCEEDED(hres)) IHTMLDocument5_Release(doc5); diff --git a/include/mshtml.idl b/include/mshtml.idl index 3e1424c..0c5a874 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -19172,3 +19172,18 @@ interface IWebBrowserPriv2IE8 : IUnknown HRESULT GetSearchTerm(BSTR *term); HRESULT GetCurrentDocument(IDispatch** doc); } + +/***************************************************************************** + * IWebBrowserPriv2IE9 interface + */ +[ + object, + uuid(3ed72303-6ffc-4214-ba90-faf1862dec8a), + local +] +interface IWebBrowserPriv2IE9 : IUnknown +{ + HRESULT NavigateWithBindCtx2(IUri *uri, VARIANT *flags, VARIANT *target_frame, VARIANT *post_data, + VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment, DWORD unused); + /* Probably more */ +}

1 0

Jacek Caban : mshtml.idl: Added IHTMLDocument7 and related interfaces declarations.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: a2002082f213eb55a80af0ab80beed3def51b2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2002082f213eb55a80af0ab8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 14 16:50:52 2014 +0100 mshtml.idl: Added IHTMLDocument7 and related interfaces declarations. --- include/mshtmdid.h | 137 ++++++++++++ include/mshtml.idl | 619 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 756 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2002082f213eb55a80af…

1 0

Dmitry Timoshkov : xmllite/tests: Add a test for names and values parsed from an XML declaration.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: 493e406bbca13d4d59e2b56eb821f95ddb173196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493e406bbca13d4d59e2b56eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 12 16:57:00 2014 +0900 xmllite/tests: Add a test for names and values parsed from an XML declaration. --- dlls/xmllite/tests/reader.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 9faf243..ad9b3a2 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -644,11 +644,21 @@ if (0) static void test_read_xmldeclaration(void) { + static const struct + { + WCHAR name[12]; + WCHAR val[12]; + } name_val[] = + { + { {'v','e','r','s','i','o','n',0}, {'1','.','0',0} }, + { {'e','n','c','o','d','i','n','g',0}, {'U','T','F','-','8',0} }, + { {'s','t','a','n','d','a','l','o','n','e',0}, {'y','e','s',0} } + }; IXmlReader *reader; IStream *stream; HRESULT hr; XmlNodeType type; - UINT count = 0; + UINT count = 0, len, i; const WCHAR *val; hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); @@ -730,6 +740,28 @@ static void test_read_xmldeclaration(void) ok(hr == S_OK, "got %08x\n", hr); ok(count == 3, "Expected 3, got %d\n", count); + for (i = 0; i < count; i++) + { + len = 0; + hr = IXmlReader_GetLocalName(reader, &val, &len); + ok(hr == S_OK, "got %08x\n", hr); + ok(len == lstrlenW(name_val[i].name), "expected %u, got %u\n", lstrlenW(name_val[i].name), len); + ok(!lstrcmpW(name_val[i].name, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].name), wine_dbgstr_w(val)); + + len = 0; + hr = IXmlReader_GetValue(reader, &val, &len); + ok(hr == S_OK, "got %08x\n", hr); + ok(len == lstrlenW(name_val[i].val), "expected %u, got %u\n", lstrlenW(name_val[i].val), len); + if (i == 1) +todo_wine + ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); + else + ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == (i < count - 1) ? S_OK : S_FALSE, "got %08x\n", hr); + } + hr = IXmlReader_GetDepth(reader, &count); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(count == 1, "Expected 1, got %d\n", count);

1 0

Dmitry Timoshkov : xmllite: Don' t fail if standalone declaration is missing.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: 09f371920fbc130ee88f7a3c7241f923278d9d82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f371920fbc130ee88f7a3c7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 16:51:21 2014 +0900 xmllite: Don't fail if standalone declaration is missing. --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/reader.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 35c3e31..a0e95b4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1134,7 +1134,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) UINT start; HRESULT hr; - if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + if (!reader_skipspaces(reader)) return S_FALSE; if (reader_cmp(reader, standaloneW)) return S_FALSE; reader_init_strvalue(reader_get_cur(reader), 10, &name); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f4ad466..9faf243 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -760,16 +760,13 @@ todo_wine { type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine ok(hr == S_OK, "expected S_OK, got %08x\n", hr); -todo_wine ok(type == XmlNodeType_XmlDeclaration, "expected XmlDeclaration, got %s\n", type_to_str(type)); ok_pos(reader, 1, 3, 1, 21, TRUE); test_read_state(reader, XmlReadState_Interactive, -1, TRUE); hr = IXmlReader_GetValue(reader, &val, NULL); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); -todo_wine ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); /* check attributes */

1 0

Jacek Caban : mshtml: Added IHTMLDocument2:: get_activeElement implementation.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: 1918d7223e8e093e936f09182399e8001a70b686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1918d7223e8e093e936f09182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 14 11:20:14 2014 +0100 mshtml: Added IHTMLDocument2::get_activeElement implementation. --- dlls/mshtml/htmldoc.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a4a0fd7..a710d8e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -186,8 +186,35 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTMLElement **p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMElement *nselem; + HTMLElement *elem; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + *p = NULL; + return S_OK; + } + + /* + * NOTE: Gecko may return an active element even if the document is not visible. + * IE returns NULL in this case. + */ + nsres = nsIDOMHTMLDocument_GetActiveElement(This->doc_node->nsdoc, &nselem); + if(NS_FAILED(nsres)) { + ERR("GetActiveElement failed: %08x\n", nsres); + return E_FAIL; + } + + hres = get_elem(This->doc_node, nselem, &elem); + nsIDOMElement_Release(nselem); + if(FAILED(hres)) + return hres; + + *p = &elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument_get_images(IHTMLDocument2 *iface, IHTMLElementCollection **p)

1 0