March 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : wine.inf: Always install start.exe in system32.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: fcb37c9c123cd841debb17b6821493b8b2f83473 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcb37c9c123cd841debb17b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 12:22:55 2021 +0200 wine.inf: Always install start.exe in system32. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50867 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 52c2297fb2f..de39c6223af 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2674,6 +2674,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,explorer.exe 11,,iexplore.exe 11,,notepad.exe +11,,start.exe 11,,winetest.exe,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,-

1 0

Alexandre Julliard : wine.inf: Store extensions in lower case in PATHEXT.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: b28c8b69b3ee51653be5c3675a6616ae0156ee7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b28c8b69b3ee51653be5c367… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 18:42:07 2021 +0200 wine.inf: Store extensions in lower case in PATHEXT. This is less likely to require a case-insensitive search. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index de39c6223af..45ba4fabfa1 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -641,7 +641,7 @@ HKLM,%Control%\Session Manager,HeapSegmentCommit,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentReserve,0x00040002,0 HKLM,%Control%\Session Manager\Environment,"ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem;%SystemRoot%\system32\WindowsPowershell\v1.0" -HKLM,%Control%\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH" +HKLM,%Control%\Session Manager\Environment,"PATHEXT",,".com;.exe;.bat;.cmd;.vbs;.vbe;.js;.jse;.wsf;.wsh" HKLM,%Control%\Session Manager\Environment,"TEMP",0x00020002,"%SystemRoot%\temp" HKLM,%Control%\Session Manager\Environment,"TMP",0x00020002,"%SystemRoot%\temp" HKLM,%Control%\Session Manager\Environment,"windir",0x00020000,"%SystemRoot%"

1 0

Alexandre Julliard : mshtml: Also search default directories for xul.dll dependencies.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: 5f19e9c3ad9d8d1978c2588e1b937086d6a5ba8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f19e9c3ad9d8d1978c2588e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 16:00:07 2021 +0200 mshtml: Also search default directories for xul.dll dependencies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 700eee4d779..d4fe7e96fc2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -609,7 +609,7 @@ static BOOL load_xul(WCHAR *gecko_path) len = wcslen(gecko_path); wcscpy(gecko_path + len, L"\\xul.dll"); - xul_handle = LoadLibraryExW(gecko_path, 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); + xul_handle = LoadLibraryExW(gecko_path, 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); gecko_path[len] = 0; if(!xul_handle) { WARN("Could not load XUL: %d\n", GetLastError());

1 0

Alexandre Julliard : winedevice: Add the drivers directory to the dll search path.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: 53ffeb67eeee09a53c07ca3ec82db3cad9339359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ffeb67eeee09a53c07ca3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 16:00:29 2021 +0200 winedevice: Add the drivers directory to the dll search path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- programs/winedevice/device.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 066e87cf977..685f7d4345b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3691,7 +3691,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); - module = LoadLibraryExW( str, 0, LOAD_WITH_ALTERED_SEARCH_PATH ); + module = LoadLibraryExW( str, 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); if (module && load_image_notify_routine_count) { diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index c591d743337..3acc5e8a799 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -115,6 +115,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { + WCHAR driver_dir[MAX_PATH]; const WCHAR *service_group = (argc >= 2) ? argv[1] : argv[0]; if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) @@ -124,6 +125,10 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) if (!(service_handle = RegisterServiceCtrlHandlerExW( winedeviceW, service_handler, (void *)service_group ))) return; + GetSystemDirectoryW( driver_dir, MAX_PATH ); + wcscat( driver_dir, L"\\drivers" ); + AddDllDirectory( driver_dir ); + TRACE( "starting service group %s\n", wine_dbgstr_w(service_group) ); set_service_status( service_handle, SERVICE_RUNNING, SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN );

1 0

Alexandre Julliard : explorer: Store the graphics driver basename instead of the full path.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: d47be63faec9670454b137fa8d8de5f732e76202 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d47be63faec9670454b137fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 16:00:58 2021 +0200 explorer: Store the graphics driver basename instead of the full path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index f525c23d819..94d178880a8 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -857,11 +857,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) name = next; } - if (module) - { - GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); - } + TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(libname) ); swprintf( key, ARRAY_SIZE(key), device_keyW, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], @@ -872,7 +868,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { if (module || null_driver) RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, - (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); + (BYTE *)libname, (lstrlenW(libname) + 1) * sizeof(WCHAR) ); else RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); RegCloseKey( hkey );

1 0

Huw Davies : riched20: Destroy the context before sending the notification.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: f1f8e4d11e4eef246fb4a66eb11704994b36e510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1f8e4d11e4eef246fb4a66e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 29 10:17:55 2021 +0100 riched20: Destroy the context before sending the notification. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 979eb3e7365..ad9f504db8e 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -104,17 +104,16 @@ void editor_draw( ME_TextEditor *editor, HDC hDC, const RECT *update ) PatBlt( hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); } } + + DeleteObject( SelectObject( hDC, brush ) ); + SelectClipRgn( hDC, oldRgn ); + if (oldRgn) DeleteObject( oldRgn ); + ME_DestroyContext( &c ); + if (editor->nTotalLength != editor->nLastTotalLength || editor->nTotalWidth != editor->nLastTotalWidth) ME_SendRequestResize(editor, FALSE); editor->nLastTotalLength = editor->nTotalLength; editor->nLastTotalWidth = editor->nTotalWidth; - - DeleteObject( SelectObject( hDC, brush ) ); - SelectClipRgn(hDC, oldRgn); - if (oldRgn) - DeleteObject(oldRgn); - - ME_DestroyContext(&c); } void ME_Repaint(ME_TextEditor *editor)

1 0

Jacek Caban : mshtml: Don't use UAS_EXACTLEGACY in navigator object.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: 02f46d7ec9d8e7ca0984ac93bbd8b9bdb724837a URL: https://source.winehq.org/git/wine.git/?a=commit;h=02f46d7ec9d8e7ca0984ac93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 29 12:04:56 2021 +0200 mshtml: Don't use UAS_EXACTLEGACY in navigator object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 1 - dlls/mshtml/tests/documentmode.js | 3 ++- dlls/mshtml/tests/dom.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 94616a7db78..43067b813a1 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1162,7 +1162,6 @@ static unsigned int get_ua_version(OmNavigator *navigator) { switch(dispex_compat_mode(&navigator->dispex)) { case COMPAT_MODE_QUIRKS: - return UAS_EXACTLEGACY | 7; case COMPAT_MODE_IE5: case COMPAT_MODE_IE7: return 7; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index ec23ab8d494..bc237061939 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -368,7 +368,8 @@ sync_test("navigator", function() { "userAgent = " + navigator.userAgent + " appVersion = " + app); re = v < 11 - ? "^" + (v < 9 ? "4" : "5") + "\\.0 \$compatible; MSIE " + (v < 7 ? 7 : v) + "\\.0; Windows NT [^\$]*\\)$" + ? "^" + (v < 9 ? "4" : "5") + "\\.0 \$compatible; MSIE " + (v < 7 ? 7 : v) + + "\\.0; Windows NT [0-9].[0-9]; .*Trident/[678]\\.0.*\$$" : "^5.0 \$Windows NT [0-9].[0-9]; .*Trident/[678]\\.0.*rv:11.0\$ like Gecko$"; ok(new RegExp(re).test(app), "appVersion = " + app); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index de33e6c73a5..e2d861d7239 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6383,7 +6383,6 @@ static void test_navigator(IHTMLDocument2 *doc) bstr = NULL; hres = IOmNavigator_get_userAgent(navigator, &bstr); ok(hres == S_OK, "get_userAgent failed: %08x\n", hres); - todo_wine ok(!lstrcmpW(bstr, buf), "userAgent returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf)); SysFreeString(bstr); @@ -6393,7 +6392,6 @@ static void test_navigator(IHTMLDocument2 *doc) hres = IOmNavigator_get_appVersion(navigator, &bstr); ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); - todo_wine ok(!lstrcmpW(bstr, buf+8), "appVersion returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf+8)); SysFreeString(bstr);

1 0

Jacek Caban : mshtml: Support deleting object properties.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: 13050fd9f1d937befca2495be1aa6a9c0f512613 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13050fd9f1d937befca2495b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 29 12:05:03 2021 +0200 mshtml: Support deleting object properties. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 41 +++++++++++--- dlls/mshtml/tests/documentmode.js | 109 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 729fac91d43..cb2721ec141 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1675,14 +1675,26 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc } } -static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) +static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR name, DWORD grfdex) { DispatchEx *This = impl_from_IDispatchEx(iface); + DISPID id; + HRESULT hres; - TRACE("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + TRACE("(%p)->(%s %x)\n", This, debugstr_w(name), grfdex); - /* Not implemented by IE */ - return E_NOTIMPL; + if(dispex_compat_mode(This) < COMPAT_MODE_IE8) { + /* Not implemented by IE */ + return E_NOTIMPL; + } + + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, name, grfdex & ~fdexNameEnsure, &id); + if(FAILED(hres)) { + TRACE("property %s not found\n", debugstr_w(name)); + return dispex_compat_mode(This) < COMPAT_MODE_IE9 ? hres : S_OK; + } + + return IDispatchEx_DeleteMemberByDispID(&This->IDispatchEx_iface, id); } static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) @@ -1691,8 +1703,25 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID TRACE("(%p)->(%x)\n", This, id); - /* Not implemented by IE */ - return E_NOTIMPL; + if(dispex_compat_mode(This) < COMPAT_MODE_IE8) { + /* Not implemented by IE */ + return E_NOTIMPL; + } + + if(is_dynamic_dispid(id)) { + DWORD idx = id - DISPID_DYNPROP_0; + dynamic_prop_t *prop; + + if(!get_dynamic_data(This) || idx > This->dynamic_data->prop_cnt) + return S_OK; + + prop = This->dynamic_data->props + idx; + VariantClear(&prop->var); + prop->flags |= DYNPROP_DELETED; + return S_OK; + } + + return S_OK; } static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index bc237061939..8755f4ab6ec 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -379,3 +379,112 @@ sync_test("navigator", function() { ok(navigator.toString() === (v < 9 ? "[object]" : "[object Navigator]"), "navigator.toString() = " + navigator.toString()); }); + +sync_test("delete_prop", function() { + var v = document.documentMode; + var obj = document.createElement("div"), r, obj2; + + obj.prop1 = true; + r = false; + try { + delete obj.prop1; + }catch(ex) { + r = true; + } + if(v < 8) { + ok(r, "did not get an expected exception"); + return; + } + ok(!r, "got an unexpected exception"); + ok(!("prop1" in obj), "prop1 is still in obj"); + + /* again, this time prop1 does not exist */ + r = false; + try { + delete obj.prop1; + }catch(ex) { + r = true; + } + if(v < 9) { + ok(r, "did not get an expected exception"); + return; + }else { + ok(!r, "got an unexpected exception"); + ok(!("prop1" in obj), "prop1 is still in obj"); + } + + r = (delete obj.className); + ok(r, "delete returned " + r); + ok("className" in obj, "className deleted from obj"); + ok(obj.className === "", "className = " + obj.className); + + /* builtin propertiles don't throw any exception, but are not really deleted */ + r = (delete obj.tagName); + ok(r, "delete returned " + r); + ok("tagName" in obj, "tagName deleted from obj"); + ok(obj.tagName === "DIV", "tagName = " + obj.tagName); + + obj = document.querySelectorAll("*"); + ok("0" in obj, "0 is not in obj"); + obj2 = obj[0]; + r = (delete obj[0]); + ok("0" in obj, "0 is not in obj"); + ok(obj[0] === obj2, "obj[0] != obj2"); + + /* test window object and its global scope handling */ + obj = window; + + obj.globalprop1 = true; + ok(globalprop1, "globalprop1 = " + globalprop1); + r = false; + try { + delete obj.globalprop1; + }catch(ex) { + r = true; + } + if(v < 9) { + ok(r, "did not get an expected exception"); + }else { + ok(!r, "got an unexpected globalprop1 exception"); + ok(!("globalprop1" in obj), "globalprop1 is still in obj"); + } + + globalprop2 = true; + ok(obj.globalprop2, "globalprop2 = " + globalprop2); + r = false; + try { + delete obj.globalprop2; + }catch(ex) { + r = true; + } + if(v < 9) { + ok(r, "did not get an expected globalprop2 exception"); + }else { + ok(!r, "got an unexpected exception"); + todo_wine. + ok(!("globalprop2" in obj), "globalprop2 is still in obj"); + } + + obj.globalprop3 = true; + ok(globalprop3, "globalprop3 = " + globalprop3); + r = false; + try { + delete globalprop3; + }catch(ex) { + r = true; + } + if(v < 9) { + ok(r, "did not get an expected exception"); + ok("globalprop3" in obj, "globalprop3 is not in obj"); + }else { + ok(!r, "got an unexpected globalprop3 exception"); + ok(!("globalprop3" in obj), "globalprop3 is still in obj"); + } + + globalprop4 = true; + ok(obj.globalprop4, "globalprop4 = " + globalprop4); + r = (delete globalprop4); + ok(r, "delete returned " + r); + todo_wine. + ok(!("globalprop4" in obj), "globalprop4 is still in obj"); +});

1 0

Jacek Caban : mshtml: Support DispHTMLHeadElement interface.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: 4efad17a9ffc1be95663b1c6cc84c16fb7830d89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4efad17a9ffc1be95663b1c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 29 12:05:20 2021 +0200 mshtml: Support DispHTMLHeadElement interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50492 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlhead.c | 2 ++ dlls/mshtml/tests/dom.c | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 879eca424ae..5dbf8d6b6bd 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -719,6 +719,8 @@ static HRESULT HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IHTMLHeadElement, riid)) *ppv = &This->IHTMLHeadElement_iface; + else if(IsEqualGUID(&DIID_DispHTMLHeadElement, riid)) + *ppv = &This->IHTMLHeadElement_iface; else return HTMLElement_QI(&This->element.node, riid, ppv); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e2d861d7239..a6ca66a2885 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -375,6 +375,7 @@ static const IID * const html_iids[] = { static const IID * const head_iids[] = { ELEM_IFACES, &IID_IHTMLHeadElement, + &DIID_DispHTMLHeadElement, &IID_IConnectionPointContainer, NULL };

1 0

Jacek Caban : mshtml: Implement IHTMLElement2::accessKey property on top of nsIDOMHTMLElement.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: 7b52ece404dacae83a19235f3c981d4e0bef50fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b52ece404dacae83a19235f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 29 13:21:55 2021 +0200 mshtml: Implement IHTMLElement2::accessKey property on top of nsIDOMHTMLElement. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40821 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 32 ++++++++++++++++++++++++-------- dlls/mshtml/tests/dom.js | 8 ++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 16e200239f3..9e5d184ff3f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2790,22 +2790,38 @@ static HRESULT WINAPI HTMLElement2_focus(IHTMLElement2 *iface) static HRESULT WINAPI HTMLElement2_put_accessKey(IHTMLElement2 *iface, BSTR v) { HTMLElement *This = impl_from_IHTMLElement2(iface); - VARIANT var; - - static WCHAR accessKeyW[] = L"accessKey"; + nsAString nsstr; + nsresult nsres; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = v; - return IHTMLElement_setAttribute(&This->IHTMLElement_iface, accessKeyW, var, 0); + if(!This->html_element) { + FIXME("non-HTML element\n"); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLElement_SetAccessKey(This->html_element, &nsstr); + nsAString_Finish(&nsstr); + return map_nsresult(nsres); } static HRESULT WINAPI HTMLElement2_get_accessKey(IHTMLElement2 *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->html_element) { + FIXME("non-HTML element\n"); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, NULL); + nsres = nsIDOMHTMLElement_GetAccessKey(This->html_element, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLElement2_put_onblur(IHTMLElement2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index a18ce409a9b..4db743241a0 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -425,3 +425,11 @@ sync_test("navigator", function() { v.testProp = true; ok(window.navigator.testProp, "window.navigator.testProp = " + window.navigator.testProp); }); + +sync_test("elem_props", function() { + var elem = document.body; + + ok(elem.accessKey === "", "accessKey = " + elem.accessKey); + elem.accessKey = "q"; + ok(elem.accessKey === "q", "accessKey = " + elem.accessKey + " expected q"); +});

1 0