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

Alexandre Julliard : explorer: Store the graphics driver basename instead of the full path.
by Alexandre Julliard March 29, 2021

March 29, 2021

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

Hugh McMaster : reg: Use RegOpenKeyExW() instead of RegOpenKeyW().
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: eee0c1f8f97d2d77118abb692e277dd440eed693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eee0c1f8f97d2d77118abb69… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 29 23:24:31 2021 +1100 reg: Use RegOpenKeyExW() instead of RegOpenKeyW(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 6ead3fc6919..0f263e91902 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -53,7 +53,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return 0; } - if (RegOpenKeyW(root, path, &key) != ERROR_SUCCESS) + if (RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &key)) { output_message(STRING_CANNOT_FIND); return 1;

1 0

Jacek Caban : mshtml: Support DispHTMLHeadElement interface.
by Alexandre Julliard March 29, 2021

March 29, 2021

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

Dmitry Kislyuk : mshtml: Fix NULL offset parent handling in IHTMLElement::get_offsetParent.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: 35d0fda0f044497df90d1ef5c1e2e359e8d3166e URL: https://source.winehq.org/git/wine.git/?a=commit;h=35d0fda0f044497df90d1ef5… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Mon Mar 29 13:21:43 2021 +0200 mshtml: Fix NULL offset parent handling in IHTMLElement::get_offsetParent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50875 Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/tests/dom.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9e5d184ff3f..81993db224d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1628,7 +1628,7 @@ static HRESULT WINAPI HTMLElement_get_offsetParent(IHTMLElement *iface, IHTMLEle if(!nsparent) { *p = NULL; - hres = S_OK; + return S_OK; } hres = get_element(nsparent, &parent); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a6ca66a2885..1253e9cdea8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1299,11 +1299,14 @@ static void _test_elem_offset(unsigned line, IUnknown *unk, const WCHAR *parent_ hres = IHTMLElement_get_offsetParent(elem, &off_parent); ok_(__FILE__,line) (hres == S_OK, "get_offsetParent failed: %08x\n", hres); - - _test_elem_tag(line, (IUnknown*)off_parent, parent_tag); - IHTMLElement_Release(off_parent); - IHTMLElement_Release(elem); + + if(off_parent) { + _test_elem_tag(line, (IUnknown*)off_parent, parent_tag); + IHTMLElement_Release(off_parent); + }else { + ok_(__FILE__,line) (parent_tag == NULL, "Offset parent is NULL. %s expected\n", wine_dbgstr_w(parent_tag)); + } } #define test_elem_source_index(a,b) _test_elem_source_index(__LINE__,a,b) @@ -8937,6 +8940,10 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = doc_get_body(doc); + test_elem_offset((IUnknown*)elem, NULL); + IHTMLElement_Release(elem); + elem = get_elem_by_id(doc, L"sc", TRUE); if(elem) { IHTMLScriptElement *script;

1 0

Alexandre Julliard : wine.inf: Store extensions in lower case in PATHEXT.
by Alexandre Julliard March 29, 2021

March 29, 2021

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

Nikolay Sivov : dwrite: Introduce interface to font backend.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: ca08a5e722517aed42474773b4a128e30d9eeb17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca08a5e722517aed42474773… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 29 10:48:53 2021 +0300 dwrite: Introduce interface to font backend. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 30 +++++++------ dlls/dwrite/font.c | 37 ++++++++++------ dlls/dwrite/freetype.c | 100 ++++++++++++++++++++++++++----------------- dlls/dwrite/layout.c | 4 +- 4 files changed, 102 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca08a5e722517aed4247…

1 0

Alexandre Julliard : ntdll: Unmap main image even if not loaded at base address.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: b12bf4d8d8b20d9234d5dd219ea33269725c1e03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b12bf4d8d8b20d9234d5dd21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 12:19:59 2021 +0200 ntdll: Unmap main image even if not loaded at base address. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50874 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 2f4d988d709..91745a2973c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1872,7 +1872,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) env[env_pos++] = 0; status = load_main_exe( main_wargv[0], main_argv[0], curdir, &image, &module, &image_info ); - if (!status && image_info.Machine != current_machine) /* need to restart for Wow64 */ + if (status >= 0 && image_info.Machine != current_machine) /* need to restart for Wow64 */ { NtUnmapViewOfSection( GetCurrentProcess(), module ); status = STATUS_INVALID_IMAGE_FORMAT;

1 0

Jacek Caban : mshtml: Implement IHTMLElement2::accessKey property on top of nsIDOMHTMLElement.
by Alexandre Julliard March 29, 2021

March 29, 2021

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

Hugh McMaster : reg: Update a comment.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: cb749592e728119bdd5a30a1080a90cf1a53546a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb749592e728119bdd5a30a1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 29 23:24:32 2021 +1100 reg: Update a comment. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 0f263e91902..c102fb4ad53 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -41,7 +41,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, } } - /* Delete subtree only if no /v* option is given */ + /* Delete registry key if no /v* option is given */ if (!value_name && !value_empty && !value_all) { if (RegDeleteTreeW(root, path) != ERROR_SUCCESS)

1 0

Alexandre Julliard : mshtml: Also search default directories for xul.dll dependencies.
by Alexandre Julliard March 29, 2021

March 29, 2021

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